From 3505b711958493545ed72529a15bd2f19a7313cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 20 May 2018 21:02:00 +0200
Subject: RPM packaging: update build scripts

---
 redhat/Makefile.r14                 | 4 ++--
 redhat/docker/centos32.sh           | 2 +-
 redhat/docker/el5/packages.base     | 1 +
 redhat/docker/el6/packages.base     | 1 +
 redhat/docker/el7/Dockerfile.x86_64 | 6 +++---
 redhat/docker/el7/packages          | 3 +++
 6 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'redhat')

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index e70f413eb..8460aaa55 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -623,7 +623,7 @@ ksquirrel:	tdebase libkipi libksquirrel
 	$(call buildpkg,applications/ksquirrel)
 
 kstreamripper:	tdebase
-# Do NOT build on Fedora >= 27 (problem with scons and python3)
+# Do NOT build on Fedora 27, OpenSUSE >= 15.0 (problem with scons and python3)
 ifeq (,$(filter $(DIST),.fc27 .oss150))
 	$(call buildpkg,applications/kstreamripper)
 endif
@@ -853,7 +853,7 @@ mathemagics:
 	$(call buildpkg,extras/mathemagics)
 
 pan: gmime intltool
-ifeq (,$(filter $(DIST),.el5))
+ifeq (,$(filter $(DIST),.el5 .oss150))
 	$(call buildpkg,3rdparty/pan)
 endif
 
diff --git a/redhat/docker/centos32.sh b/redhat/docker/centos32.sh
index 5dda472b2..afbb25a7f 100755
--- a/redhat/docker/centos32.sh
+++ b/redhat/docker/centos32.sh
@@ -16,7 +16,7 @@ REPO="centos-${VERSION}"
 # Installation minimale de la distribution
 rm -rf "${INSTALLROOT}"
 install -m 644 "${DIR}/${REPO}.repo" "/etc/yum.repos.d"
-yum install --disablerepo="*" --enablerepo="${REPO}*" --nogpgcheck -y  --installroot "${INSTALLROOT}" libselinux yum
+yum install --disablerepo="*" --enablerepo="${REPO}*" --nogpgcheck --releasever="${VERSION}" -y  --installroot "${INSTALLROOT}" libselinux yum yum-plugin-ovl
 rm -f "/etc/yum.repos.d/${REPO}.repo"
 touch "${INSTALLROOT}/etc/fstab" "${INSTALLROOT}/etc/mtab"
 
diff --git a/redhat/docker/el5/packages.base b/redhat/docker/el5/packages.base
index f4cc26a66..7765aa5df 100644
--- a/redhat/docker/el5/packages.base
+++ b/redhat/docker/el5/packages.base
@@ -3,3 +3,4 @@ perl
 setarch
 vim-enhanced
 yum
+yum-plugin-ovl
diff --git a/redhat/docker/el6/packages.base b/redhat/docker/el6/packages.base
index f4cc26a66..7765aa5df 100644
--- a/redhat/docker/el6/packages.base
+++ b/redhat/docker/el6/packages.base
@@ -3,3 +3,4 @@ perl
 setarch
 vim-enhanced
 yum
+yum-plugin-ovl
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index b52a5a702..52038a142 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -4,15 +4,15 @@ ARG TDE_VERSION=14.0.4
 ARG ARCH=x86_64
 
 # Add EPEL repository
-RUN rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm
+RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-7-11.noarch.rpm
 
 # Add NUX repository
 RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm
 
 # Install Trinity build dependencies
-ADD packages /etc/yum.repos.d/packages
+ADD packages /packages
 RUN yum update -y
-RUN yum install -y $(</etc/yum.repos.d/packages)
+RUN yum install -y $(</packages)
 
 # Add YUM repository for locally built packages
 ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 10bea3044..57a2f2b44 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -71,6 +71,7 @@ java-devel
 java-openjdk
 kernel
 lame-devel
+lcms-devel
 libacl-devel
 libarchive-devel
 libart_lgpl-devel
@@ -127,6 +128,7 @@ libXtst-devel
 libXv-devel
 libXxf86dga-devel
 libXxf86vm-devel
+libusb-devel
 lirc-devel
 lm_sensors-devel
 meanwhile-devel
@@ -194,3 +196,4 @@ xscreensaver-gl-base
 xscreensaver-gl-extras
 xulrunner-devel
 xz-devel
+yum-plugin-ovl
-- 
cgit v1.2.3