From bbfa80f7f281c76c2aa5c053d0ec9eb23926b02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 6 Jul 2023 12:15:47 +0200 Subject: [PATCH] RPM: update build scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/build/build_rpm_package.sh | 2 +- redhat/core/tdebase/tdebase.spec | 2 +- redhat/core/tdelibs/tdelibs.spec | 4 +++- redhat/docker/el9/Dockerfile.x86_64 | 5 +++-- redhat/docker/f38/Dockerfile.x86_64 | 2 -- redhat/docker/f38/rpmmacros | 1 + redhat/docker/mga9/packages.x86_64 | 1 + redhat/docker/osstw/Dockerfile.i686 | 4 ++-- redhat/docker/osstw/Dockerfile.x86_64 | 4 ++-- redhat/docker/osstw/packages | 1 + 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index fa5439b2c..6e214e641 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -21,7 +21,7 @@ DIST="$(rpmdist.sh --dist)" [ -z "${TMPPATH}" ] && TMPPATH="/dev/shm" BUILDDIR="${TMPPATH}/BUILD${DIST}.${ARCH}" BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.${ARCH}" -LOGFILE="${TMPPATH}/log.${COMP##*/}" +LOGFILE="${TMPPATH}/log.${PKGNAME##*/}" export TEMPDIR="$(mktemp -d)" gather_rpm_sources.sh "${PKGNAME}" "${TDE_VERSION}" "${TEMPDIR}" diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec index 9648593b8..390e4a1af 100644 --- a/redhat/core/tdebase/tdebase.spec +++ b/redhat/core/tdebase/tdebase.spec @@ -202,7 +202,7 @@ Requires: hicolor-icon-theme-branding %endif # OpenSuse TW Theme -%if "%{?suse_version}" == "1550" +%if "%{?suse_version}" == "1699" Requires: wallpaper-branding %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg Requires: hicolor-icon-theme-branding diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec index 3d18d4954..6b817e97b 100644 --- a/redhat/core/tdelibs/tdelibs.spec +++ b/redhat/core/tdelibs/tdelibs.spec @@ -245,10 +245,12 @@ BuildRequires: xorg-x11-devel %endif # ICEAUTH -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34 +%if 0%{?fedora} >= 34 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1220 Requires: iceauth BuildRequires: iceauth %endif + +# Xorg %if 0%{?rhel} >= 5 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) Requires: xorg-x11-server-utils BuildRequires: xorg-x11-server-utils diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 index 32039dce0..3b37c6507 100644 --- a/redhat/docker/el9/Dockerfile.x86_64 +++ b/redhat/docker/el9/Dockerfile.x86_64 @@ -44,9 +44,10 @@ 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/p/pilot-link-0.12.5-50.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm -RUN sudo rpm -Uvh \ +RUN wget -nv -P ${HOME}/rpmbuild/RPMS/x86_64 \ http://rpms.remirepo.net/enterprise/9/remi/x86_64/libicu69-69.1-4.el9.remi.x86_64.rpm \ - http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm + http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib{icu69,yaz}-*.rpm RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm diff --git a/redhat/docker/f38/Dockerfile.x86_64 b/redhat/docker/f38/Dockerfile.x86_64 index 9663eb000..9eb2900fa 100644 --- a/redhat/docker/f38/Dockerfile.x86_64 +++ b/redhat/docker/f38/Dockerfile.x86_64 @@ -31,8 +31,6 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \ USER trinity 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 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/f38/rpmmacros b/redhat/docker/f38/rpmmacros index 6c116b15a..4d5b149f6 100644 --- a/redhat/docker/f38/rpmmacros +++ b/redhat/docker/f38/rpmmacros @@ -6,4 +6,5 @@ %__cmake_in_source_build 1 %_debugsource_packages %nil %_debugsource_template %nil +%_fortify_level 2 %source_date_epoch_from_changelog 0 diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64 index 324364b40..27f28f737 100644 --- a/redhat/docker/mga9/packages.x86_64 +++ b/redhat/docker/mga9/packages.x86_64 @@ -98,6 +98,7 @@ lib64mp3lame-devel lib64musicbrainz5-devel lib64npth-devel lib64paper-devel +lib64pcre-devel lib64pkcs11-helper-devel lib64poppler-devel lib64pulseaudio-devel diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 9a0593c0d..d8c29751d 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -26,14 +26,14 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && 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/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.1.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.2.src.rpm \ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ && setarch ${ARCH} rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install # Add lilypond (i686 only) -RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.1-2.2.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.1-2.3.src.rpm \ && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 1e9205626..ac50ad16a 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -13,7 +13,7 @@ RUN set -x \ && zypper -n install --allow-vendor-change $(>/etc/sudoers USER trinity @@ -26,7 +26,7 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && 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/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.1.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.2.src.rpm \ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index b1abbed8b..7032cacde 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -206,6 +206,7 @@ ruby ruby-devel sane-backends-devel scons +shadow speex-devel sqlite3-devel subversion-devel