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/el7/packages | 6 ++++++ redhat/docker/el7/rpmmacros | 1 + redhat/docker/el8/Dockerfile.x86_64 | 5 +++-- redhat/docker/el8/packages | 1 + redhat/docker/el9/Dockerfile.x86_64 | 2 +- redhat/docker/el9/packages | 7 +++++++ redhat/docker/f37/Dockerfile.x86_64 | 6 +----- redhat/docker/f37/packages | 2 +- redhat/docker/oss154/Dockerfile.x86_64 | 7 +++++++ redhat/docker/oss154/packages | 1 + redhat/docker/pclinuxos/packages.x86_64 | 2 -- 11 files changed, 29 insertions(+), 11 deletions(-) (limited to 'redhat') diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index a1d43dc74..78dd12598 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -9,7 +9,9 @@ binutils-devel bison bluez-libs-devel boost-devel +boost-python36-devel bzip2-devel +byacc ccache cdparanoia cdparanoia-devel @@ -19,6 +21,7 @@ clamav clamav-devel clucene-core-devel cmake +cmake3 cpp cppunit-devel createrepo @@ -64,6 +67,7 @@ gtk2-devel gtk+-devel gtk-doc guile-devel +heimdal-devel hiredis-devel hspell-devel html2ps @@ -175,11 +179,13 @@ pigz pilot-link-devel pkcs11-helper-devel pkgconfig(pygtk-2.0) +polkit-devel poppler-devel postgresql-devel ppp pth-devel pulseaudio-libs-devel +python3-devel qt-devel readline-devel recode diff --git a/redhat/docker/el7/rpmmacros b/redhat/docker/el7/rpmmacros index b76d30014..e0a64de43 100644 --- a/redhat/docker/el7/rpmmacros +++ b/redhat/docker/el7/rpmmacros @@ -1,3 +1,4 @@ %dist .el7 %_smp_mflags -j8 %jobs 8 +%cmake %cmake3 diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index 7fdb8bdb9..78f152ba6 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -1,4 +1,4 @@ -FROM centos:8 +FROM rockylinux:8 ARG TDE_VERSION=14.1.0 ARG ARCH=x86_64 @@ -14,7 +14,8 @@ COPY centos-devel.repo /etc/yum.repos.d/centos-devel.repo # Enable supplementary repositories # Install Trinity build dependencies COPY packages /packages -RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ +RUN set -x \ + && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ && curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \ && dnf -y update \ && dnf -y install epel-release \ diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index 4ba3e2fca..06283e94e 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -45,6 +45,7 @@ gamin-devel gcc gcc-c++ gcc-gfortran +geoip-devel gettext-devel giflib-devel glibmm24-devel diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 index a2915804a..32039dce0 100644 --- a/redhat/docker/el9/Dockerfile.x86_64 +++ b/redhat/docker/el9/Dockerfile.x86_64 @@ -69,7 +69,7 @@ RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-4.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/vorbis-tools-1*.rpm -RUN rpmbuild --rebuild 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 rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/s/sword-1.9.0-9.fc36.src.rpm --undefine "__cmake_in_source_build" \ diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages index dda2b1b20..aafbf92a4 100644 --- a/redhat/docker/el9/packages +++ b/redhat/docker/el9/packages @@ -60,6 +60,7 @@ gstreamer1-plugins-base-devel gtk2-devel gtk3-devel gtk-doc +heimdal-devel help2man hiredis hspell-devel @@ -178,6 +179,7 @@ polkit-devel poppler-devel postgresql postgresql-devel +postgresql-server-devel ppp pulseaudio-libs-devel python3 @@ -216,4 +218,9 @@ xine-lib-devel xmlto xorg-x11-server-utils xorg-x11-util-macros +xscreensaver +xscreensaver-base +xscreensaver-extras +xscreensaver-gl-base +xscreensaver-gl-extras xz-devel 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 diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64 index 760db5067..2600fac56 100644 --- a/redhat/docker/oss154/Dockerfile.x86_64 +++ b/redhat/docker/oss154/Dockerfile.x86_64 @@ -30,3 +30,10 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch + +# Install heimdal development files +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.4/repo/oss/src/libheimdal-7.7.0-bp154.1.43.src.rpm \ + && wget -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://objects.githubusercontent.com/github-production-release-asset-2e65be/319333/be127800-88cf-11e9-901a-8182ad5b94e1?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20230410%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230410T153423Z&X-Amz-Expires=300&X-Amz-Signature=9ceafbdc1252b40abdbec062b63dcb444ecd91c4dcad13f96a27faed69f04546&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=319333&response-content-disposition=attachment%3B%20filename%3Dheimdal-7.7.0.tar.gz&response-content-type=application%2Foctet-stream" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.7.0.tar.gz|" -e "/^%patch0/ s|^%|#|" \ + && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.7.0/tools/ install diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages index cf75e1def..751eba0af 100644 --- a/redhat/docker/oss154/packages +++ b/redhat/docker/oss154/packages @@ -20,6 +20,7 @@ clucene-core-devel cmake createrepo_c cups-devel +curl cyrus-sasl-devel dbus-1-devel dbus-1-glib-devel diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index e63e1594e..85dd12684 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -53,7 +53,6 @@ java-sun lcms-devel lib64clucene2-devel lib64cryptsetup-devel -lib64db4.8-devel lib64dvdread-devel lib64exiv2-devel lib64fbclient-devel @@ -90,7 +89,6 @@ libcdda-devel libcln-devel libconfig-devel libcurl-devel -libffmpeg-devel libflac-devel libflac++-devel libfontenc-devel -- cgit v1.2.1