RPM: update docker scripts

3 files changed, 22 insertions, 5 deletions

diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 6ace1d446..d9701cae7 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,10 +1,11 @@
 FROM pclinuxos:2018
 
-ARG TDE_VERSION=14.0.6
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Update distribution
 RUN apt-get -y update
+RUN apt-get -y install glibc
 RUN apt-get -y dist-upgrade
 
 # Install Trinity build dependencies
@@ -30,3 +31,8 @@ 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
+
+# Build supplementary development tools
+RUN rpm -i --define "_topdir /tmp" http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm
+RUN sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|"
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/torsocks-2*.rpm
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index e6d7358f0..c1472b30b 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -30,7 +30,6 @@ gamin-devel
 gcc-c++
 gettext-devel
 glib2-devel
-gnokii-devel
 gnutls-devel
 gpgme-devel
 gphoto2-devel
@@ -44,27 +43,35 @@ ImageMagick-devel
 imake
 imlib2-devel
 java-devel
+java-sun
 lcms-devel
+lib64clucene-devel
 lib64cryptsetup-devel
+lib64db4.8-devel
 lib64dvdread-devel
 lib64exiv2-devel
+lib64fbclient-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,7 +83,6 @@ libflac++-devel
 libfontenc-devel
 libgadu-devel
 libgstreamer0.10-devel
-libical-devel
 libice-devel
 libjack-devel
 libjasper-devel
@@ -142,6 +148,8 @@ opensc
 openslp-devel
 pam-devel
 perl-devel
+perl-PAR-Packer
+perl-pcsc-perl
 pilot-link-devel
 postgresql
 postgresql-devel
@@ -149,6 +157,7 @@ pth-devel
 python3
 python-devel
 python-rpm
+qt4-devel
 recode
 rpm-build
 rpm-devel
@@ -162,6 +171,8 @@ subversion-devel
 sudo
 sword-devel
 taglib-devel
+texinfo
+torsocks
 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