RPM: update build scripts for RHEL8

4 files changed, 40 insertions, 17 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index 8758c4cf2..44f810ea7 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -478,9 +478,7 @@ ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8))
 endif
 
 smartcardauth:	tdebase
-ifeq (,$(filter $(DIST),.el8))
 	$(call buildpkg,applications/smartcardauth)
-endif
 
 smb4k:	tdebase
 	$(call buildpkg,applications/smb4k)
@@ -535,7 +533,7 @@ tde-systemsettings:	tdebase
 tdmtheme:	tdebase
 	$(call buildpkg,applications/tdmtheme)
 
-tellico:	tdebase tdemultimedia
+tellico:	tdebase tdegraphics tdemultimedia tdepim
 	$(call buildpkg,applications/tellico)
 
 tork:	tdebase
diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec
index 6525e00cb..c9cc5f878 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/koffice/koffice.spec
@@ -720,7 +720,7 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?mgaversion} || 0%{?mdkversion}
 Requires:		fonts-ttf-dejavu
 %else
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7
 Requires:		dejavu-lgc-sans-fonts
 %endif
 %if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index 2f8d8aeb3..af184025a 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -58,21 +58,14 @@ RUN 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 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/r/rdiff-backup-1.2.8-31.fc30.src.rpm
-RUN 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/l/liblo-0.29-2.fc30.src.rpm
-#RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm
-
-#RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/t/t1utils-1.39-9.fc30.src.rpm
-#RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/t1utils-1*.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
+RUN 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/m/mftrace-1.2.19-6.fc30.src.rpm
-#RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/mftrace-1*.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
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/python2-pyxattr-0*.rpm --nodeps
 
-#RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/lilypond-2.19.82-4.fc30.src.rpm
-#RUN sed -i ${HOME}/rpmbuild/SPECS/lilypond.spec -e "s|texlive-lh||"
-#RUN rpmbuild -bb ${HOME}/rpmbuild/SPECS/lilypond.spec
+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
+RUN 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
 RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
@@ -80,4 +73,34 @@ RUN 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
 RUN 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
+RUN 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
+RUN 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
+RUN 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
+RUN 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
+RUN 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
+RUN 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
+RUN 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
+RUN 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 sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index 29d65e748..4564537aa 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -154,6 +154,8 @@ perl(ExtUtils::MakeMaker)
 perl(inc::Module::Install)
 perl(IPC::Run3)
 perl(Module::Signature)
+perl(Test::Pod)
+perl(Test::Pod::Coverage)
 perl(XML::Parser)
 pigz
 pkcs11-helper-devel