RPM: Update for final R14.1.3

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

6 files changed, 15 insertions, 11 deletions

diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index 12ce82bca..261171614 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -52,13 +52,10 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin
 RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm
 
-#RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \
-# && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \
-# && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/%forgeautosetup/ s|.*|%autosetup -p1 -n libunibreak-libunibreak_6_1|" -e "s|%forgesource|libunibreak-libunibreak_6_1.tar.gz|" \
-# && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec --define "forgemeta %nil" \
-# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm
-
 RUN set -x \
  && rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/39/Everything/source/tree/Packages/l/libunibreak-4.0-13.fc39.src.rpm --define "ldconfig_scriptlets %post -p /sbin/ldconfig" \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{4,devel}*.rpm
- 
+
+RUN set -x \
+ && rpmbuild --rebuild http://vault.almalinux.org/8.10/AppStream/Source/Packages/taglib-1.11.1-8.el8.src.rpm --define "ldconfig_scriptlets %post -p /sbin/ldconfig" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/taglib-{1,devel}*.rpm
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index 173497991..611588b23 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -127,6 +127,7 @@ libtiff-devel
 libtirpc-devel
 libtool
 libtool-ltdl-devel
+libunibreak-devel
 libutempter-devel
 libv4l-devel
 libvisual-devel
diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64
index 89c831306..66447ca34 100644
--- a/redhat/docker/mga9/packages.x86_64
+++ b/redhat/docker/mga9/packages.x86_64
@@ -102,6 +102,7 @@ lib64pcre-devel
 lib64pkcs11-helper-devel
 lib64poppler-devel
 lib64pulseaudio-devel
+lib64raptor-devel
 lib64rsvg2-devel
 lib64sane1-devel
 lib64t1lib-devel
diff --git a/redhat/docker/oss155/packages b/redhat/docker/oss155/packages
index 3d3897e5b..5d827fe6e 100644
--- a/redhat/docker/oss155/packages
+++ b/redhat/docker/oss155/packages
@@ -136,10 +136,12 @@ libtool
 libtwolame-devel
 libudev1
 libudisks2-0-devel
+libunibreak-devel
 libuuid-devel
 libv4l-devel
 libvisual-devel
 libvorbis-devel
+libwebp-devel
 libwmf-devel
 libwpd-devel
 libXaw-devel
@@ -176,6 +178,7 @@ pam-devel
 patch
 pciutils-devel
 pcre-devel
+pcre2-devel
 pcsc-lite-devel
 perl(JSON)
 perl-PAR-Packer
@@ -193,6 +196,7 @@ rpcgen
 rpm-build
 rpmlint
 rsvg-convert
+rsync
 ruby
 ruby-devel
 sane-backends-devel
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index ae7a5ab45..61254a3f9 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -43,20 +43,20 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM
  && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.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
 
 RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/rpcsvc-proto-1.4-1.mga8.src.rpm \
- && sed -i ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec  -e "s|%autosetup .*|%setup -q|" -e "s|%configure|%configure2_5x|" -e "s|%license|%doc|" \
+ && 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 \
+ && sed -i ${HOME}/rpmbuild/SPECS/html2ps.spec -e "s|%patch|%patch -P |" \
  && 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/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|^|#|" \
+ && sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%patch|%patch -P |" -e "/Conflicts:  krb5-devel/ s|^|#|" -e "s|%mkrel 2|1%{?dist}|" \
  && 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/remove.sh b/redhat/docker/remove.sh
index 2773f64ce..f901cef85 100755
--- a/redhat/docker/remove.sh
+++ b/redhat/docker/remove.sh
@@ -6,9 +6,10 @@ ARCH="$3"
 
 [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2"
 [ -z "${ARCH}" ] && ARCH="x86_64"
+[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
 FILE="${HOME}/tde/docker/${IMAGE}.tar.gz"
 
-docker rmi -f "${IMAGE}"
+${DOCKER} rmi -f "${IMAGE}"
 rm -f "${FILE}"