diff options
Diffstat (limited to 'redhat/docker/f42')
| -rw-r--r-- | redhat/docker/f42/Dockerfile.x86_64 | 7 | ||||
| -rwxr-xr-x | redhat/docker/f42/external-packages.sh | 6 | ||||
| -rw-r--r-- | redhat/docker/f42/packages | 2 |
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 |
