From db2c03db6c26c1cc54ac2fca55ab2bfbfd7af903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 20 May 2022 09:46:52 +0200
Subject: [PATCH] RPM: update oss154 build scripts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Andriot <albator78@libertysurf.fr>
---
 redhat/docker/oss154/Dockerfile.x86_64 | 5 ++++-
 redhat/docker/oss154/packages          | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64
index 4de243e36..b2bd08902 100644
--- a/redhat/docker/oss154/Dockerfile.x86_64
+++ b/redhat/docker/oss154/Dockerfile.x86_64
@@ -6,10 +6,13 @@ ARG ARCH=x86_64
 # Add PACKMAN repository
 # Install Trinity build dependencies
 COPY packages /packages
-RUN echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+RUN set -x \
+ && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
  && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
+ && rm -fv /etc/zypp/repos.d/repo-sle-* \
  && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.4/ packman \
  && zypper refresh \
+ && zypper -n remove libjpeg62-devel \
  && zypper -n update \
  && zypper -n install -l $(</packages)
 
diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages
index aecfd10a2..68265c8db 100644
--- a/redhat/docker/oss154/packages
+++ b/redhat/docker/oss154/packages
@@ -97,6 +97,7 @@ libidn-devel
 libiw-devel
 libjack-devel
 libjasper-devel
+libjpeg8-devel
 liblcms2-devel
 liblo-devel
 liblrdf-devel