3 files changed, 17 insertions, 42 deletions
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index f252b37e8..090d63f9d 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -20,7 +20,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
  && 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 \
+ && dnf config-manager --enable powertools \
  && dnf -y --enableplugin=ovl install $(</packages)
 
 # Add YUM repository for locally built packages
@@ -40,56 +40,17 @@ 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/libofx-0.9.13-2.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/g/gnuchess-6.2.5-8.fc30.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/g/gnuchess-6.2.5-10.fc32.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pilot-link-0.12.5-41.fc30.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm
 
-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 --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 \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-1*.rpm --nodeps
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-10.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/s/sword-1.8.1-11.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/psutils-1.23-15.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-1*.rpm
-
-#RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/j/jasper-2.0.14-8.fc30.src.rpm
-#RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/jasper-2*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/w/wireless-tools-29-22.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm
-
-RUN rpmbuild --rebuild https://li.nux.ro/download/nux/dextop/el7/SRPMS/libgssglue-0.4-2.el7.nux.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libgssglue{,-devel}-0*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libao-1.2.0-14.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libao{,-devel}-1*.rpm
-
-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 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
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Dist-0.49-17.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Dist-0*.rpm
-
 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
 
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index a9018237e..08e696e2a 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -57,6 +57,7 @@ gtk2-devel
 gtk3-devel
 gtk-doc
 guile-devel
+heimdal-devel
 hspell-devel
 icu
 ImageMagick-devel
@@ -71,6 +72,7 @@ java-openjdk
 kernel
 lame-devel
 libacl-devel
+libao-devel
 libarchive-devel
 libassuan-devel
 libblkid-devel
@@ -85,6 +87,7 @@ libdvdread-devel
 libfontenc-devel
 libgpod-devel
 libgsf-devel
+libgssglue-devel
 libical-devel
 libidn-devel
 libksba-devel
@@ -95,6 +98,7 @@ libmp4v2-devel
 libmpcdec-devel
 libmtp-devel
 libnsl2-devel
+libofx-devel
 libogg-devel
 libotr-devel
 libpaper-devel
@@ -149,12 +153,14 @@ pam-devel
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+pcsc-perl
 perl
 perl-devel
 perl-generators
 perl(ExtUtils::MakeMaker)
 perl(inc::Module::Install)
 perl(IPC::Run3)
+perl(PAR::Dist)
 perl(Module::Signature)
 perl(Test::Pod)
 perl(Test::Pod::Coverage)
@@ -167,11 +173,16 @@ postgresql
 postgresql-devel
 postgresql-server-devel
 ppp
+psutils
 pulseaudio-libs-devel
+pylibacl
 python2
 python2-devel
 python3
 python3-devel
+python3-pyxattr
+rdesktop
+rdiff-backup
 readline-devel
 recode
 redhat-rpm-config
@@ -188,6 +199,7 @@ sqlite-devel
 subversion-devel
 sudo
 swig
+sword-devel
 systemd-devel
 taglib-devel
 tcl
diff --git a/redhat/docker/el8/rpmmacros b/redhat/docker/el8/rpmmacros
index c6a7ce03a..dc2cb7e68 100644
--- a/redhat/docker/el8/rpmmacros
+++ b/redhat/docker/el8/rpmmacros
@@ -1,3 +1,5 @@
 %dist .el8
 %_smp_mflags -j8
 %jobs 8
+%_debugsource_packages %nil
+%_debugsource_template %nil