RPM: updates for future 14.0.9 release

2 files changed, 17 insertions, 21 deletions

diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index 11d0bc58e..43f6b7191 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -3,31 +3,29 @@ FROM centos:8
 ARG TDE_VERSION=14.0.8
 ARG ARCH=x86_64
 
-# Enable proxy
-RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf"
+# Enable custom repository
+COPY centos-devel.repo /etc/yum.repos.d/centos-devel.repo
 
+# Enable proxy
 # Install OVL plugin for DNF
 # Update distribution packages
 # Add EPEL repository
 # Add RPMFUSION repository
 # Enable supplementary repositories
-RUN curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+ && curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \
  && dnf -y update \
  && dnf -y install epel-release \
  && dnf -y install https://download1.rpmfusion.org/free/el/updates/8/x86_64/r/rpmfusion-free-release-8-0.1.noarch.rpm \
  && dnf -y install dnf-plugins-core \
- && dnf config-manager --enable PowerTools
-
-# Enable custom repository
-ADD centos-devel.repo /etc/yum.repos.d/centos-devel.repo
-
-# Install Trinity build dependencies
-ADD packages /packages
-RUN dnf -y --enableplugin=ovl install $(</packages)
+ && dnf config-manager --enable PowerTools \
+ && dnf -y --enableplugin=ovl 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
@@ -38,13 +36,10 @@ 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
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libxml%2b%2b-2.40.1-8.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm
-
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libofx-0.9.13-2.fc30.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm
 
@@ -57,7 +52,7 @@ RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pylibacl-0.5.2-11.fc30.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pylibacl-0*.rpm --nodeps
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pyxattr-0.5.6-3.fc30.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pyxattr-0.5.6-3.fc30.src.rpm --nocheck \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/python2-pyxattr-0*.rpm --nodeps
 
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdiff-backup-1.2.8-31.fc30.src.rpm \
@@ -87,9 +82,7 @@ RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdesktop-1.8.4-3.fc30.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
 
-RUN cd ${HOME}/rpmbuild/RPMS \
- && wget http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm \
- && sudo rpm -Uvh hiredis-0.13.3-9.el8.remi.x86_64.rpm libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm
+RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm
 
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-1.015-8.fc30.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
@@ -100,5 +93,5 @@ RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-28.fc30.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm --nocheck \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index 7eafa7d52..a9018237e 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -121,6 +121,7 @@ libXcomposite-devel
 libXdamage-devel
 libXdmcp-devel
 libxkbfile-devel
+libxml++-devel
 libXScrnSaver-devel
 libxslt-devel
 libXtst-devel
@@ -165,6 +166,7 @@ poppler-devel
 postgresql
 postgresql-devel
 postgresql-server-devel
+ppp
 pulseaudio-libs-devel
 python2
 python2-devel
@@ -195,6 +197,7 @@ transfig
 unixODBC-devel
 usbutils
 valgrind
+wget
 wireless-tools-devel
 xine-lib-devel
 xmlto