From 376aaac49c32861178bffba63854799a0172255a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 22 Aug 2023 12:48:48 +0200 Subject: add patch for RPM 4.19 to workaround https://bugzilla.redhat.com/2233454 --- scl-utils.spec | 67 +++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 22 deletions(-) (limited to 'scl-utils.spec') diff --git a/scl-utils.spec b/scl-utils.spec index 535b859..c5019dd 100644 --- a/scl-utils.spec +++ b/scl-utils.spec @@ -3,8 +3,8 @@ Name: scl-utils Epoch: 1 -Version: 2.0.2 -Release: 21%{dist} +Version: 2.0.3 +Release: 5%{?dist} Summary: Utilities for alternative packaging License: GPLv2+ @@ -12,14 +12,15 @@ URL: https://github.com/sclorg/scl-utils Source0: https://github.com/sclorg/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Source1: macros.scl-filesystem BuildRequires: gcc make -Buildrequires: cmake -Buildrequires: rpm-devel +BuildRequires: cmake +BuildRequires: rpm-devel +BuildRequires: libcmocka libcmocka-devel environment-modules Requires: %{_bindir}/modulecmd Patch1: 0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch - -# https://github.com/sclorg/scl-utils/pull/25 -Patch100: scl-utils-2.0.2-rhbz-1728450.patch +Patch2: BZ-2056462-do-not-error-out-on-SIGINT.patch +Patch3: BZ-2091000-remove-tmp-file.patch +Patch4: rpm419.patch %description Run-time utility for alternative packaging. @@ -40,12 +41,10 @@ Essential RPM build macros for alternative packaging. make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %if 0%{?fedora} >= 33 -sed -e 's/__python}/__python3}/' \ - -e '/brp-python-hardlink/d' \ +sed -e '/brp-python-hardlink/d' \ -i rpm/macros.scl %endif - %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} @@ -61,7 +60,11 @@ mkdir modulefiles mkdir prefixes ln -s prefixes conf +%check +make check + %files +%dir %{_sysconfdir}/scl %dir %{_sysconfdir}/scl/modulefiles %dir %{_sysconfdir}/scl/prefixes %{_sysconfdir}/scl/conf @@ -84,20 +87,40 @@ ln -s prefixes conf %{_rpmconfigdir}/brp-scl-python-bytecompile %changelog -* Thu Feb 16 2023 Remi Collet - 1:2.0.2-21 -- F38 build +* Tue Aug 22 2023 Remi Collet - 1:2.0.3-5 +- add patch for RPM 4.19 + to workaround https://bugzilla.redhat.com/2233454 + +* Tue Aug 22 2023 Remi Collet - 1:2.0.3-4 +- F39 rebuild from CentOS 9 Stream package + +* Tue Dec 13 2022 Florian Festi - 1:2.0.3-4 +- Remove tmp file (#2151261) + +* Mon Feb 21 2022 Michal Domonkos - 1:2.0.3-3 +- Don't error out when command receives SIGINT (#2056462) + +* Tue Aug 10 2021 Mohan Boddu - 1:2.0.3-2 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Mon Jul 26 2021 Michal Domonkos - 1:2.0.3-1 +- Rebase to 2.0.3 (#1986085) + +* Mon Jul 26 2021 Michal Domonkos - 1:2.0.2-21 +- Own directory /etc/scl (#1986040) -* Wed Aug 17 2022 Remi Collet - 1:2.0.2-20 -- F37 build +* Fri Jul 23 2021 Honza Horak - 1:2.0.2-20 +- Fix problem with python version in the byte compilation script (#1984598) -* Sun Sep 5 2021 Remi Collet - 1:2.0.2-19 -- drop brp-python-hardlink call +* Wed May 12 2021 Michal Domonkos - 1:2.0.2-19 +- Fix dist tag syntax (#1958982) -* Sat Sep 4 2021 Remi Collet - 1:2.0.2-18 -- F35 rebuild +* Fri Apr 16 2021 Mohan Boddu - 1:2.0.2-18 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 -* Tue Aug 18 2020 Remi Collet - 1:2.0.2-17 -- use python3 by default +* Wed Jan 27 2021 Fedora Release Engineering - 1:2.0.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild * Wed Jul 29 2020 Vitaly Zaitsev - 1:2.0.2-16 - Backported upstream patches to resolve RHBZ#1728450. @@ -117,10 +140,10 @@ ln -s prefixes conf * Fri Jul 26 2019 Fedora Release Engineering - 1:2.0.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Mon Jun 10 2019 Igor Gnatenko - 1:2.0.2-10 +* Mon Jun 10 22:13:23 CET 2019 Igor Gnatenko - 1:2.0.2-10 - Rebuild for RPM 4.15 -* Mon Jun 10 2019 Igor Gnatenko - 1:2.0.2-9 +* Mon Jun 10 15:42:05 CET 2019 Igor Gnatenko - 1:2.0.2-9 - Rebuild for RPM 4.15 * Sat Feb 02 2019 Fedora Release Engineering - 1:2.0.2-8 -- cgit