RPM: update packaging for R14.1.5

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

4 files changed, 16 insertions, 16 deletions

diff --git a/redhat/docker/rawhide/Dockerfile.x86_64 b/redhat/docker/rawhide/Dockerfile.x86_64
index 8f92141e5..1c77d92e9 100644
--- a/redhat/docker/rawhide/Dockerfile.x86_64
+++ b/redhat/docker/rawhide/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:rawhide
 
-ARG TDE_VERSION=14.1.4
+ARG TDE_VERSION=14.1.5
 ARG ARCH=x86_64
 
 # Fix DNF database corruption
@@ -10,7 +10,7 @@ COPY packages /packages
 RUN set -x \
  && echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
  && dnf -y install dnf-plugin-ovl findutils \
- && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-rawhide.noarch.rpm \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-44.noarch.rpm \
  && dnf -y --enableplugin=ovl update \
  && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
 
@@ -32,15 +32,3 @@ RUN set -x \
 
 USER trinity
 COPY rpmmacros /home/trinity/.rpmmacros
-
-RUN set -x \
- && rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
- && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
-
-#RUN set -x \
-# && rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \
-# && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \
-# && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \
-# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2*
diff --git a/redhat/docker/rawhide/external-packages.sh b/redhat/docker/rawhide/external-packages.sh
new file mode 100644
index 000000000..7a0c3fa36
--- /dev/null
+++ b/redhat/docker/rawhide/external-packages.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -ex
+
+rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm
+sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g"
+rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec
+sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
+
+#RUN set -x \
+# && rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \
+# && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \
+# && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \
+# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2*
diff --git a/redhat/docker/rawhide/packages b/redhat/docker/rawhide/packages
index 872963678..8367d3d92 100644
--- a/redhat/docker/rawhide/packages
+++ b/redhat/docker/rawhide/packages
@@ -28,6 +28,7 @@ createrepo_c
 cryptsetup-devel
 cups-devel
 dbus-glib-devel
+desktop-backgrounds-compat
 djvulibre
 djvulibre-devel
 dnf-plugin-ovl
@@ -172,7 +173,6 @@ nspr-devel
 ocaml
 ocaml(compiler)
 ocaml-facile-devel
-OpenEXR-devel
 openldap-devel
 opensc
 openslp-devel
diff --git a/redhat/docker/rawhide/rpmmacros b/redhat/docker/rawhide/rpmmacros
index 0b82d6547..41e776b5d 100644
--- a/redhat/docker/rawhide/rpmmacros
+++ b/redhat/docker/rawhide/rpmmacros
@@ -1,4 +1,4 @@
-%dist .fc43
+%dist .fc44
 %_smp_mflags -j8
 %jobs 8
 %__brp_remove_la_files %nil