diff --git a/scl-utils-2.0.2-rhbz-2029959.patch b/scl-utils-2.0.2-rhbz-2029959.patch new file mode 100644 index 0000000..93ffd93 --- /dev/null +++ b/scl-utils-2.0.2-rhbz-2029959.patch @@ -0,0 +1,25 @@ +commit c529964024850038f142f0a93c6c343bb910641f +Author: Michal Nowak +Date: Tue Dec 7 17:35:01 2021 +0100 + + 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 + +diff --git a/rpm/macros.scl b/rpm/macros.scl +index 550243e..c007cfd 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 %{__python} %{?_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}" diff --git a/scl-utils.spec b/scl-utils.spec index 2065adc..97129e8 100644 --- a/scl-utils.spec +++ b/scl-utils.spec @@ -4,7 +4,7 @@ Name: scl-utils Epoch: 1 Version: 2.0.2 -Release: 22%{dist} +Release: 23%{dist} Summary: Utilities for alternative packaging License: GPLv2+ @@ -20,6 +20,8 @@ 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 +# https://github.com/sclorg/scl-utils/pull/43 +Patch101: scl-utils-2.0.2-rhbz-2029959.patch %description Run-time utility for alternative packaging. @@ -78,6 +80,10 @@ ln -s prefixes conf %{_rpmconfigdir}/brp-scl-python-bytecompile %changelog +* Fri Jun 02 2023 Michal Nowak - 2.0.2-23 +- Support F35+ "brp-python-hardlink" script location. + Resolves: rhbz#2029959 + * Mon May 29 2023 Petr Pisar - 1:2.0.2-22 - Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19)