RPM: synchronize redhat directory with r14.1.x branch

Signed-off-by: François Andriot <albator78@libertysurf.fr>

3 files changed, 19 insertions, 7 deletions

diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 2aa9f8200..1d92b8a8a 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,13 +1,13 @@
-FROM pclinuxos:2021
+FROM pclinuxos:2024
 
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
 ARG ARCH=x86_64
 
 # Update distribution
 # Install Trinity build dependencies
 COPY packages.${ARCH} /packages
-RUN apt-get -y update \
- && apt-get -y install glibc \
+RUN set -x \
+ && apt-get -y update \
  && apt-get -y dist-upgrade \
  && apt-get -y install $(</packages)
 
@@ -26,8 +26,7 @@ COPY genla.sh /usr/bin/genla.sh
 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
+ && 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 \
@@ -56,3 +55,8 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM
 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
+
+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 \
+ && 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
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index 85dd12684..d34407ee8 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -34,6 +34,7 @@ gamin-devel
 gcc-c++
 gettext-devel
 glib2-devel
+gnokii-devel
 gnutls-devel
 gpgme-devel
 gphoto2-devel
@@ -56,6 +57,7 @@ lib64cryptsetup-devel
 lib64dvdread-devel
 lib64exiv2-devel
 lib64fbclient-devel
+lib64ffmpeg-devel
 lib64geoip-devel
 lib64gif-devel
 lib64gpod4
@@ -65,6 +67,7 @@ lib64gstreamer-plugins-base1.0-devel
 lib64idn-devel
 lib64inotifytools-devel
 lib64iw29-devel
+lib64jack-devel
 lib64nm-devel
 lib64mpcdec-devel
 lib64OpenSP5-devel
@@ -84,6 +87,7 @@ lib64xaw-devel
 lib64xine1.2-devel
 lib64xtst-devel
 lib64yaz-devel
+libattr-devel
 libcap-devel
 libcdda-devel
 libcln-devel
@@ -158,6 +162,7 @@ net-snmp-devel
 ocaml
 OpenEXR-devel
 openldap-devel
+openldap-servers
 opensc
 openslp-devel
 pam-devel
@@ -168,12 +173,13 @@ perl-PAR-Packer
 perl-pcsc-perl
 pilot-link-devel
 pkgconfig(pygtk-2.0)
+popt-devel
 postgresql
 postgresql-devel
 ppp
 pth-devel
 python3
-python-devel
+python3-devel
 python-rpm
 qt4-devel
 recode
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index a8b78eb0d..5c9fcc2e4 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -3,3 +3,5 @@
 %jobs 8
 %pclinuxos 2022
 %configure %configure2_5x
+%python python3
+%__python /usr/bin/python3