summaryrefslogtreecommitdiffstats
path: root/redhat/docker/pclinuxos
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/docker/pclinuxos')
-rw-r--r--redhat/docker/pclinuxos/Dockerfile.x86_646
-rw-r--r--redhat/docker/pclinuxos/packages.x86_647
-rw-r--r--redhat/docker/pclinuxos/rpmmacros7
3 files changed, 15 insertions, 5 deletions
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 1d92b8a8a..ae7a5ab45 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -56,7 +56,7 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm
-RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/updates/heimdal-7.7.1-1.3.mga8.src.rpm \
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/heimdal-7.8.0-2.mga9.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%autopatch|%patch1|" -e "/Conflicts: krb5-devel/ s|^|#|" \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \
- && echo sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm
+ && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \
+ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index d34407ee8..e0e5fb2ba 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -33,6 +33,7 @@ fribidi-devel
gamin-devel
gcc-c++
gettext-devel
+ghostscript
glib2-devel
gnokii-devel
gnutls-devel
@@ -70,18 +71,23 @@ lib64iw29-devel
lib64jack-devel
lib64nm-devel
lib64mpcdec-devel
+lib64nas-devel
+lib64npth-devel
lib64OpenSP5-devel
lib64pcsclite-devel
lib64pkcs11-helper-devel
lib64polkit1-devel
lib64poppler-devel
lib64readline-devel
+lib64rsvg2-devel
lib64sane1-devel
lib64sndfile-devel
lib64ssh-devel
+lib64udev1-devel
lib64unwind-devel
lib64usb1.0-devel
lib64usb-compat0.1-devel
+lib64webp-devel
lib64wv2-devel
lib64xaw-devel
lib64xine1.2-devel
@@ -159,6 +165,7 @@ mysql-devel
nas-devel
neon-devel
net-snmp-devel
+netpbm
ocaml
OpenEXR-devel
openldap-devel
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index 5c9fcc2e4..00b98f240 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -1,7 +1,10 @@
-%dist .pclos
+%dist .pclos2024
%_smp_mflags -j8
%jobs 8
-%pclinuxos 2022
+%pclinuxos 2024
%configure %configure2_5x
%python python3
%__python /usr/bin/python3
+%_vpath_builddir .
+%python_sitearch %python3_sitearch
+%python_sitelib %python3_sitelib