From 54bd4f2bec4944f18827f1557b18ff316dea153e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 12 May 2022 16:04:34 +0200
Subject: RPM: update docker/pclinuxos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Andriot <albator78@libertysurf.fr>
---
 redhat/docker/pclinuxos/Dockerfile.x86_64 | 9 +++++++--
 redhat/docker/pclinuxos/packages.x86_64   | 3 +++
 redhat/docker/pclinuxos/rpmmacros         | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index b481b2781..22ff44d7e 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -27,6 +27,7 @@ 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
+ && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so
 
 # Add non-root user to build packages
 RUN rm -rf /home/trinity \
@@ -37,12 +38,12 @@ USER trinity
 COPY 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 rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/torsocks-2.3.0-2.mga8.src.rpm \
  && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \
  && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec \
  && sudo rpm -Uvh /home/trinity/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 rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/cscope-15.9-2.mga8.src.rpm \
  && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec  -e "s|%autopatch|%patch0|" \
  && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \
  && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm
@@ -51,3 +52,7 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM
  && sed -i ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec  -e "s|%autosetup .*|%setup -q|" -e "s|%configure|%configure2_5x|" -e "s|%license|%doc|" \
  && rpmbuild -ba ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec \
  && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/rpcgen-1*.rpm
+
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/html2ps-2.0-3.b7.8.mga8.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \
+ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index abbbc7948..3135b2a39 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -70,6 +70,7 @@ lib64mpcdec-devel
 lib64OpenSP5-devel
 lib64pcsclite-devel
 lib64pkcs11-helper-devel
+lib64polkit1-devel
 lib64poppler-devel
 lib64readline-devel
 lib64sane1-devel
@@ -161,12 +162,14 @@ opensc
 openslp-devel
 pam-devel
 perl-devel
+perl-Image-Magick
 perl-PAR-Packer
 perl-pcsc-perl
 pilot-link-devel
 pkgconfig(pygtk-2.0)
 postgresql
 postgresql-devel
+ppp
 pth-devel
 python3
 python-devel
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index bbb269929..a8b78eb0d 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -1,5 +1,5 @@
 %dist .pclos
 %_smp_mflags -j8
 %jobs 8
-%pclinuxos 2021
+%pclinuxos 2022
 %configure %configure2_5x
-- 
cgit v1.2.3