SOURCES/brp-python-hardlink.patch

@@ -0,0 +1,29 @@
+From e75f3f522f34e1cdd19852763363dd8b503e305e Mon Sep 17 00:00:00 2001
+From: Michal Nowak <mnowak@isc.org>
+Date: Tue, 7 Dec 2021 17:35:01 +0100
+Subject: [PATCH] Update brp-python-hardlink path
+
+Since Fedora 35 "brp-python-hardlink" script is in /usr/lib/rpm/redhat/.
+Otherwise RPM build fails with:
+
+    + /usr/lib/rpm/brp-python-hardlink
+    /var/tmp/rpm-tmp.VsVGRP: line 312: /usr/lib/rpm/brp-python-hardlink: No such file or directory
+
+Fixes #42
+---
+ rpm/macros.scl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rpm/macros.scl b/rpm/macros.scl
+index f1ee5f2..0d27a6b 100644
+--- a/rpm/macros.scl
++++ b/rpm/macros.scl
+@@ -91,7 +91,7 @@ package or when debugging this package.
+     }
+     /usr/lib/rpm/brp-strip-static-archive %{__strip}
+     /usr/lib/rpm/brp-scl-python-bytecompile %{__python3} %{?_python_bytecompile_errors_terminate_build} %{_scl_root}
+-    /usr/lib/rpm/brp-python-hardlink
++    [ -f /usr/lib/rpm/redhat/brp-python-hardlink ] && /usr/lib/rpm/redhat/brp-python-hardlink || /usr/lib/rpm/brp-python-hardlink
+ %{nil}}
+ BuildRequires: scl-utils-build
+ %if "%{?scl}%{!?scl:0}" == "%{pkg_name}"

SPECS/scl-utils.spec

@@ -4,10 +4,10 @@
 Name:       scl-utils
 Epoch:      1
 Version:    2.0.3
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Utilities for alternative packaging
 
-License:    GPLv2+
+License:    GPL-2.0-or-later
 URL:        https://github.com/sclorg/scl-utils
 Source0:    https://github.com/sclorg/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 Source1:    macros.scl-filesystem
@@ -20,6 +20,7 @@ Requires:   %{_bindir}/modulecmd
 Patch1:     0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch
 Patch2:     BZ-2056462-do-not-error-out-on-SIGINT.patch
 Patch3:     BZ-2091000-remove-tmp-file.patch
+Patch4:     brp-python-hardlink.patch
 
 %description
 Run-time utility for alternative packaging.
@@ -39,9 +40,7 @@ Essential RPM build macros for alternative packaging.
 %cmake .
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
-
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 if [ %{macrosdir} != %{_sysconfdir}/rpm ]; then
     mkdir -p %{buildroot}%{macrosdir}
@@ -82,30 +81,47 @@ make check
 %{_rpmconfigdir}/brp-scl-python-bytecompile
 
 %changelog
-* Tue Dec 13 2022 Florian Festi <ffesti@redhat.com> - 1:2.0.3-4
-- Remove tmp file (#2151261)
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:2.0.3-5
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Tue Aug 27 2024 Brian Stinson <bstinson@redhat.com> - 2.0.3-4
+- Bump NVR to maintain upgrade path with RHEL 9
+  Related: RHEL-52633
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:2.0.3-3
+- Bump release for June 2024 mass rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Aug 23 2023 Remi Collet <remi@remirepo/net> - 1:2.0.3-1
+- Rebase to 2.0.3
+- add upstream patch to fix brp-python-hardlink path
+- use SPDX license ID
+- run upstream tests
 
-* Mon Feb 21 2022 Michal Domonkos <mdomonko@redhat.com> - 1:2.0.3-3
-- Don't error out when command receives SIGINT (#2056462)
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.0.3-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Fri Jun 02 2023 Michal Nowak <mnowak@isc.org> - 2.0.2-23
+- Support F35+ "brp-python-hardlink" script location.
+  Resolves: rhbz#2029959
 
-* Mon Jul 26 2021 Michal Domonkos <mdomonko@redhat.com> - 1:2.0.3-1
-- Rebase to 2.0.3 (#1986085)
+* Mon May 29 2023 Petr Pisar <ppisar@redhat.com> - 1:2.0.2-22
+- Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19)
 
-* Mon Jul 26 2021 Michal Domonkos <mdomonko@redhat.com> - 1:2.0.2-21
-- Own directory /etc/scl (#1986040)
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
-* Fri Jul 23 2021 Honza Horak <hhorak@redhat.com> - 1:2.0.2-20
-- Fix problem with python version in the byte compilation script (#1984598)
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Wed May 12 2021 Michal Domonkos <mdomonko@redhat.com> - 1:2.0.2-19
-- Fix dist tag syntax (#1958982)
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.0.2-18
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild