From 4eb630f7e97a35b0f7b4ac885cd61af3c74c0d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 11 Apr 2023 17:23:48 +0200 Subject: RPM: update docker scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/docker/f37/Dockerfile.x86_64 | 6 +----- redhat/docker/f37/packages | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'redhat/docker/f37') diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64 index 59f7d9fd4..0390ea2f7 100644 --- a/redhat/docker/f37/Dockerfile.x86_64 +++ b/redhat/docker/f37/Dockerfile.x86_64 @@ -33,11 +33,7 @@ COPY rpmmacros /home/trinity/.rpmmacros RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm -RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-* - -RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ +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 \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* diff --git a/redhat/docker/f37/packages b/redhat/docker/f37/packages index 474a39686..cca3f9bb1 100644 --- a/redhat/docker/f37/packages +++ b/redhat/docker/f37/packages @@ -69,6 +69,7 @@ gtk+-devel gtk-doc guile-devel harfbuzz-devel +heimdal-devel hspell-devel htdig html2ps @@ -116,7 +117,6 @@ libofx-devel libogg-devel libotr-devel libpaper-devel -libpqxx-devel libqalculate-devel libraw1394-devel librsvg2 -- cgit v1.2.1