16 files changed, 43 insertions, 39 deletions
diff --git a/redhat/Makefile b/redhat/Makefile
index 49a95c5ec..84fcb65d9 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -677,7 +677,7 @@ ifneq (,$(filter $(DIST), .oss160 .osstw ))
 endif
 
 pinentry-tqt: tqtinterface
-ifeq (,$(filter $(DIST), .el5 .el6 .el7 .fc43 .osstw ))
+ifeq (,$(filter $(DIST), .el5 .el6 .el7 ))
 	$(call buildpkg,extras/pinentry-tqt)
 endif
 
diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec
index 6f063b45c..8bd3be059 100644
--- a/redhat/core/tdesdk/tdesdk.spec
+++ b/redhat/core/tdesdk/tdesdk.spec
@@ -123,7 +123,7 @@ BuildRequires:	libdb-4_8-devel
 %endif
 %endif
 %if 0%{?mdkver}
-BuildRequires:	lib64db5.3-devel
+BuildRequires:	%{_lib}db5.3-devel
 %endif
 
 # kbabel,  F-7+: flex >= 2.5.33-9
diff --git a/redhat/docker/el10/Dockerfile.x86_64 b/redhat/docker/el10/Dockerfile.x86_64
index f5afce13e..e8ef770b5 100644
--- a/redhat/docker/el10/Dockerfile.x86_64
+++ b/redhat/docker/el10/Dockerfile.x86_64
@@ -15,7 +15,7 @@ RUN set -x \
  && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
  && curl -o /usr/lib/python3.12/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \
  && dnf -y update \
- && dnf -y almalinux-release-devel \
+ && dnf -y install almalinux-release-devel \
  && dnf -y install epel-release \
  && dnf -y install https://download1.rpmfusion.org/free/el/updates/10/x86_64/r/rpmfusion-free-release-10-1.noarch.rpm \
  && dnf -y install dnf-plugins-core \
diff --git a/redhat/docker/el10/external-packages.sh b/redhat/docker/el10/external-packages.sh
index 932eeab35..deb519e23 100755
--- a/redhat/docker/el10/external-packages.sh
+++ b/redhat/docker/el10/external-packages.sh
@@ -6,12 +6,12 @@
 # && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm
 
 rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/i/iceauth-1.0.8-4.el9.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/iceauth-1*.rpm
+ && sudo rpm -Uvh --force ${HOME}/rpmbuild/RPMS/*/iceauth-1*.rpm
 
-wget -nv \
-  https://archives.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/paper-2.3-6.el9.x86_64.rpm \
-  https://archives.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/psutils-2.07-1.el9.noarch.rpm \
- && sudo rpm -Uvh psutils-2.07-1.el9.noarch.rpm paper-2.3-6.el9.x86_64.rpm
+#wget -nv \
+#  https://archives.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/paper-2.3-6.el9.x86_64.rpm \
+#  https://archives.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/psutils-2.07-1.el9.noarch.rpm \
+# && sudo rpm -Uvh psutils-2.07-1.el9.noarch.rpm paper-2.3-6.el9.x86_64.rpm
 
 #rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/g/gnulib-0-53.20250704git.el9.src.rpm \
 # && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnulib-devel-0*.rpm
diff --git a/redhat/docker/el8/external-packages.sh b/redhat/docker/el8/external-packages.sh
index 1d8088e41..1d8088e41 100644..100755
--- a/redhat/docker/el8/external-packages.sh
+++ b/redhat/docker/el8/external-packages.sh
diff --git a/redhat/docker/f43/packages b/redhat/docker/f43/packages
index e3cdc3c41..c9da26dae 100644
--- a/redhat/docker/f43/packages
+++ b/redhat/docker/f43/packages
@@ -196,6 +196,7 @@ postgresql-server-devel
 ppp
 pulseaudio-libs-devel
 python3
+python3-d2to1.noarch
 python3-devel
 qt4-devel
 recode
diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh
index 292ae9983..4698cd740 100755
--- a/redhat/docker/opensuse32.sh
+++ b/redhat/docker/opensuse32.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 if [ "$(whoami)" != "root" ]; then
   sudo exec $0 $@
@@ -20,7 +20,7 @@ INSTALLROOT="/dev/shm/${IMAGE}"
 [ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip
 
 for dir in dev proc sys; do
-  if [ -d "${INSTALLROOT}/${dir}" ]; then
+  if [ -d "${INSTALLROOT}/${dir}" ] && grep "${INSTALLROOT}/${dir}" /proc/mounts; then
     umount "${INSTALLROOT}/${dir}"
   fi
 done
@@ -58,7 +58,6 @@ setarch i686 zypper --root "${INSTALLROOT}"  \
   glibc-extra \
   grep \
   gzip \
-  libpcre1 \
   libselinux1 \
   openSUSE-release \
   system-user-root \
@@ -77,12 +76,13 @@ done
 rm -rfv "${INSTALLROOT}/var/cache/zypp/packages/"*
 
 FILE="${IMAGE//\//_}.tar"
-tar -C "${INSTALLROOT}" -c . >"${FILE}"
+FILE="${FILE//:/_}"
+tar -C "${INSTALLROOT}" -c . >"/tmp/${FILE}"
 rm -rf "${INSTALLROOT}"
 
-docker rmi -f "${IMAGE}"
-docker import "${FILE}" "${IMAGE}"
+podman rmi -f "${IMAGE}"
+podman import "/tmp/${FILE}" "${IMAGE}"
 
-${GZIP} "${FILE}"
+${GZIP} "/tmp/${FILE}"
 mkdir -p "/home/${SUDO_USER}/tde/docker"
-mv -fv "${FILE}.gz" "/home/${SUDO_USER}/tde/docker"
+mv -fv "/tmp/${FILE}.gz" "/home/${SUDO_USER}/tde/docker"
diff --git a/redhat/docker/oss156/external-packages.sh b/redhat/docker/oss156/external-packages.sh
index b03f5b080..b03f5b080 100644..100755
--- a/redhat/docker/oss156/external-packages.sh
+++ b/redhat/docker/oss156/external-packages.sh
diff --git a/redhat/docker/oss156/packages b/redhat/docker/oss156/packages
index 876496d61..3af17a341 100644
--- a/redhat/docker/oss156/packages
+++ b/redhat/docker/oss156/packages
@@ -188,9 +188,9 @@ perl-macros
 perl-pcsc
 pkcs11-helper-devel
 polkit-devel
-postgresql
-postgresql-devel
-postgresql-server-devel
+postgresql17
+postgresql17-devel
+postgresql17-server-devel
 ppp
 python3-devel
 python3-sip-devel
diff --git a/redhat/docker/osstw/external-packages.sh b/redhat/docker/osstw/external-packages.sh
index edb7a3116..e0bb0d4bd 100644..100755
--- a/redhat/docker/osstw/external-packages.sh
+++ b/redhat/docker/osstw/external-packages.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 # Add lilypond (i686 only)
-rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.6.src.rpm
-sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \
-setarch i686 rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \
-sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm"
+rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.6.src.rpm \
+ && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \
+ && setarch i686 rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \
+ && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm"
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index a5f6cca04..c137df37e 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -187,9 +187,9 @@ pkcs11-helper-devel
 pkgconfig(bdw-gc)
 pkgconfig(guile-3.0)
 polkit-devel
-postgresql
-postgresql-devel
-postgresql-server-devel
+postgresql18
+postgresql18-devel
+postgresql18-server-devel
 potrace-devel
 ppp
 python3-devel
diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg
index a0b374342..643fc35ae 100644
--- a/redhat/docker/pclinuxos.pkg
+++ b/redhat/docker/pclinuxos.pkg
@@ -34,10 +34,9 @@ gnupg
 gnutls
 grep
 gzip
-icu
 icu69-data
 icu71-data
-icu76-data
+icu73-data
 info-install
 kernel-userspace-headers
 krb5
@@ -83,7 +82,7 @@ lib64gsasl
 lib64gudev1.0_0
 lib64icu69
 lib64icu71
-lib64icu76
+lib64icu73
 lib64idn11
 lib64idn2_0
 lib64intl8
@@ -237,4 +236,3 @@ kernel-devel
 dkms-minimal
 lib64lzo2_2
 lib64bb2_1
-
diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh
index 89f946a8c..8b54031d0 100755
--- a/redhat/docker/pclinuxos.sh
+++ b/redhat/docker/pclinuxos.sh
@@ -47,9 +47,9 @@ sudo chroot "${INSTALLROOT}" apt-get -y upgrade
 sudo umount "${INSTALLROOT}/dev/shm"
 sudo umount "${INSTALLROOT}/dev"
 
-docker rmi -f "${IMAGE}" || :
-sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}"
-docker run -ti --rm "${IMAGE}" ls -l
+podman rmi -f "${IMAGE}" || :
+sudo tar -C "${INSTALLROOT}" -c . | podman import - "${IMAGE}"
+podman run -ti --rm "${IMAGE}" ls -l
 sudo rm -rf "${INSTALLROOT}"
 
-docker image save "${IMAGE}" | ${GZIP} -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz"
+podman image save "${IMAGE}" | ${GZIP} -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz"
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index abb4b6e46..41d851448 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -7,10 +7,9 @@ ARG ARCH=x86_64
 # Install Trinity build dependencies
 COPY packages.${ARCH} /packages
 RUN set -x \
- && apt-get -y update \
- && apt-get -y dist-upgrade \
- && apt-get -y update \
- && apt-get -y install $(</packages)
+ && apt -y update \
+ && apt -y dist-upgrade \
+ && apt -y install $(</packages)
 
 # Add rpmbuild repositories
 # Fix SUDO configuration
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index 8f8e07778..95935258b 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -46,6 +46,7 @@ gtk+3.0-devel
 hspell-devel
 htdig
 iceauth
+icu-devel
 ImageMagick-devel
 imake
 imlib2-devel
@@ -180,12 +181,17 @@ perl-Image-Magick
 perl-PAR-Packer
 perl-pcsc-perl
 pilot-link-devel
+pkgconfig(cairo)
+pkgconfig(freetype2)
+pkgconfig(pango)
+pkgconfig(harfbuzz)
 pkgconfig(pygtk-2.0)
 popt-devel
 postgresql
 postgresql-devel
 ppp
 pth-devel
+python-cairo-devel
 python3
 python3-devel
 python3-setuptools
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 00a207ce0..0019aacb6 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -235,7 +235,7 @@ Requires: trinity-tderadio
 Requires: trinity-tdesshaskpass
 Requires: trinity-tdesudo
 Requires: trinity-tdesvn
-%if 0%{?suse_version} <= 1699
+%if 0%{?suse_version} < 1699
 Requires: trinity-tdexsldbg
 %endif
 Requires: trinity-tdmtheme