summaryrefslogtreecommitdiffstats
path: root/redhat/docker/f42
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2025-11-02 18:41:29 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2025-11-02 18:41:29 +0100
commit9a981abe36c5a5ee2f63812b86a2a58142c5106b (patch)
tree662a3ce1eb0004fcc1c87d425ea881886eba4e1e /redhat/docker/f42
parent16831320a4347e229656872bc54dac5dbb91369e (diff)
downloadtde-packaging-9a981abe.tar.gz
tde-packaging-9a981abe.zip
RPM: update packaging for R14.1.5
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/docker/f42')
-rw-r--r--redhat/docker/f42/Dockerfile.x86_647
-rwxr-xr-xredhat/docker/f42/external-packages.sh6
-rw-r--r--redhat/docker/f42/packages2
3 files changed, 8 insertions, 7 deletions
diff --git a/redhat/docker/f42/Dockerfile.x86_64 b/redhat/docker/f42/Dockerfile.x86_64
index 18761130b..47749fbc9 100644
--- a/redhat/docker/f42/Dockerfile.x86_64
+++ b/redhat/docker/f42/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:42
-ARG TDE_VERSION=14.1.4
+ARG TDE_VERSION=14.1.5
ARG ARCH=x86_64
# Fix DNF database corruption
@@ -30,8 +30,3 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
USER trinity
COPY rpmmacros /home/trinity/.rpmmacros
-
-RUN 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*
diff --git a/redhat/docker/f42/external-packages.sh b/redhat/docker/f42/external-packages.sh
new file mode 100755
index 000000000..c11281bd9
--- /dev/null
+++ b/redhat/docker/f42/external-packages.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -ex
+
+rpm -ivh 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*
diff --git a/redhat/docker/f42/packages b/redhat/docker/f42/packages
index 872963678..8367d3d92 100644
--- a/redhat/docker/f42/packages
+++ b/redhat/docker/f42/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