From 07c298ecad0eb6d37d8914bff91f40328b20a9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 11 Oct 2020 22:55:54 +0200
Subject: RPM: updates for future 14.0.9 release

---
 redhat/docker/el6/Dockerfile.x86_64 | 17 +++++++----------
 redhat/docker/el6/packages          |  3 ++-
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'redhat/docker/el6')

diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index c133b4122..3836529c2 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -4,23 +4,20 @@ ARG TDE_VERSION=14.0.8
 ARG ARCH=x86_64
 
 # Enable proxy
-RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf"
-
 # Add EPEL repository
 # Add RPMFUSION repository
-RUN rpm -Uvh \
-  https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \
-  https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm
-
 # Install Trinity build dependencies
-ADD packages /packages
-RUN yum -y clean all \
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
+ && yum -y clean all \
  && yum -y update \
+ && yum -y install epel-release \
+ && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
  && yum -y install $(</packages)
 
 # Add YUM repository for locally built packages
 WORKDIR /etc/yum.repos.d
-ADD rpmbuild.repo rpmbuild.repo
+COPY rpmbuild.repo rpmbuild.repo
 RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
 
 # Fix utempter detection
@@ -34,7 +31,7 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
 USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 
diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages
index 2b9fa4b07..beeba9fff 100644
--- a/redhat/docker/el6/packages
+++ b/redhat/docker/el6/packages
@@ -29,7 +29,7 @@ db4-devel
 dbus-glib-devel
 djvulibre
 djvulibre-devel
-docbook2x
+docbook2X
 doxygen
 e2fsprogs-devel
 emacs
@@ -224,6 +224,7 @@ wireless-tools-devel
 xine-lib-devel
 xmlto
 xorg-x11-font-utils
+xorg-x11-server-utils
 xscreensaver
 xscreensaver-extras
 xulrunner-devel
-- 
cgit v1.2.1