RPM: massive update and cleanup

3 files changed, 53 insertions, 22 deletions

diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 6ace1d446..2cd400aba 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,32 +1,48 @@
-FROM pclinuxos:2018
+FROM pclinuxos:2020
 
-ARG TDE_VERSION=14.0.6
+ARG TDE_VERSION=14.0.8
 ARG ARCH=x86_64
 
 # Update distribution
-RUN apt-get -y update
-RUN apt-get -y dist-upgrade
+RUN apt-get -y update && apt-get -y install glibc && apt-get -y dist-upgrade
 
 # Install Trinity build dependencies
 ADD packages.${ARCH} /packages
-RUN apt-get -y install $(</packages)
+RUN apt-get -y update && apt-get -y install $(</packages)
 
 # Add rpmbuild repositories
 ADD rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list
 RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
 
-# Add non-root user to build packages
-RUN rm -rf /home/trinity
-RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
-
 # Fix SUDO configuration
-RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|"
+#RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
 
 # Fix missing '.la' files
 ADD genla.sh /usr/bin/genla.sh
-RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64
-RUN genla.sh libjpeg
-RUN genla.sh liblcms
-RUN genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la
+RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \
+ && genla.sh libjpeg \
+ && genla.sh liblcms \
+ && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la
+
+# Add non-root user to build packages
+RUN rm -rf /home/trinity && useradd -m -s /bin/bash -u 1000 trinity && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+
+USER trinity
+ADD rpmmacros /home/trinity/.rpmmacros
+
+# Build supplementary development tools
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec
+
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec  -e "s|%autopatch|%patch0|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec
+
+USER root
+RUN rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm
+
+USER trinity
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index e6d7358f0..800b9989a 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -14,6 +14,7 @@ cups-devel
 desktop-file-utils
 djvulibre
 docbook-style-xsl
+docbook2x
 doxygen
 drakconf
 dssi-devel
@@ -30,7 +31,6 @@ gamin-devel
 gcc-c++
 gettext-devel
 glib2-devel
-gnokii-devel
 gnutls-devel
 gpgme-devel
 gphoto2-devel
@@ -40,31 +40,42 @@ gtk2-devel
 gtk+3.0-devel
 hspell-devel
 htdig
+iceauth
 ImageMagick-devel
 imake
 imlib2-devel
+intltool
 java-devel
+java-sun
 lcms-devel
+lib64clucene-devel
 lib64cryptsetup-devel
+lib64db4.8-devel
 lib64dvdread-devel
 lib64exiv2-devel
+lib64fbclient-devel
+lib64geoip-devel
 lib64gif-devel
 lib64gpod4
+lib64gpod-devel
 lib64idn-devel
 lib64inotifytools-devel
 lib64iw29-devel
 lib64nm-devel
 lib64mpcdec-devel
 lib64OpenSP5-devel
+lib64pcsclite-devel
 lib64pkcs11-helper-devel
 lib64poppler-devel
 lib64readline-devel
 lib64sane1-devel
+lib64sndfile-devel
 lib64usb1.0-devel
 lib64usb-compat0.1-devel
 lib64wv2-devel
 lib64xaw-devel
 lib64xine1.2-devel
+lib64xtst-devel
 lib64yaz-devel
 libcap-devel
 libcdda-devel
@@ -76,10 +87,8 @@ libflac++-devel
 libfontenc-devel
 libgadu-devel
 libgstreamer0.10-devel
-libical-devel
 libice-devel
-libjack-devel
-libjasper-devel
+lib64jasper-devel
 libjpeg-devel
 liblame-devel
 liblo-devel
@@ -102,6 +111,7 @@ libqalculate-devel
 libraw1394-devel
 librsvg
 librsync-devel
+libsamplerate-devel
 libsmbclient-devel
 libsm-devel
 libt1lib-devel
@@ -142,13 +152,17 @@ opensc
 openslp-devel
 pam-devel
 perl-devel
+perl-PAR-Packer
+perl-pcsc-perl
 pilot-link-devel
+pkgconfig(pygtk-2.0)
 postgresql
 postgresql-devel
 pth-devel
 python3
 python-devel
 python-rpm
+qt4-devel
 recode
 rpm-build
 rpm-devel
@@ -162,6 +176,7 @@ subversion-devel
 sudo
 sword-devel
 taglib-devel
+texinfo
 transfig
 udisks2-devel
 unixODBC-devel
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index 59b0e9d95..6b1a9016a 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -1,4 +1,4 @@
-%dist .pclos2018
+%dist .pclos
 %_smp_mflags -j8
 %jobs 8
-%pclinuxos 2018
+%pclinuxos 2019