RPM: update build scripts

2 files changed, 23 insertions, 23 deletions

diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 9617ead17..a0fa770a1 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,49 +1,48 @@
 FROM pclinuxos:2018
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.8
 ARG ARCH=x86_64
 
 # Update distribution
-RUN apt-get -y update
-RUN apt-get -y install glibc
-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"
 
 # 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
-RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+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
-RUN sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|"
-RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec
-RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/torsocks-2*.rpm
-
-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
-RUN sed -i ${HOME}/rpmbuild/SPECS/cscope.spec  -e "s|%autopatch|%patch0|"
-RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec
-RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm
+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 8b485671e..e2dfbeec1 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -31,6 +31,7 @@ gamin-devel
 gcc-c++
 gettext-devel
 glib2-devel
+gnokii-devel
 gnutls-devel
 gpgme-devel
 gphoto2-devel
@@ -85,7 +86,6 @@ libfontenc-devel
 libgadu-devel
 libgstreamer0.10-devel
 libice-devel
-libjack-devel
 libjasper-devel
 libjpeg-devel
 liblame-devel
@@ -109,6 +109,7 @@ libqalculate-devel
 libraw1394-devel
 librsvg
 librsync-devel
+libsamplerate-devel
 libsmbclient-devel
 libsm-devel
 libt1lib-devel