summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-08-23 10:59:09 +0200
committerRemi Collet <remi@php.net>2023-08-23 10:59:09 +0200
commit66f601b33c97e105920ec60a9fe85f07a6ed1783 (patch)
tree448dfb8f3a5125f98320d3ccafe46837bce456a9
parent376aaac49c32861178bffba63854799a0172255a (diff)
add upstream patch to fix brp-python-hardlink pathHEADmaster
-rw-r--r--scl-utils.spec11
1 files changed, 5 insertions, 6 deletions
diff --git a/scl-utils.spec b/scl-utils.spec
index c5019dd..f8d95de 100644
--- a/scl-utils.spec
+++ b/scl-utils.spec
@@ -4,7 +4,7 @@
Name: scl-utils
Epoch: 1
Version: 2.0.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Utilities for alternative packaging
License: GPLv2+
@@ -21,6 +21,7 @@ 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: rpm419.patch
+Patch5: brp-python-hardlink.patch
%description
Run-time utility for alternative packaging.
@@ -40,11 +41,6 @@ Essential RPM build macros for alternative packaging.
%cmake .
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
-%if 0%{?fedora} >= 33
-sed -e '/brp-python-hardlink/d' \
- -i rpm/macros.scl
-%endif
-
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
@@ -87,6 +83,9 @@ make check
%{_rpmconfigdir}/brp-scl-python-bytecompile
%changelog
+* Wed Aug 23 2023 Remi Collet <remi@remirepo.net> - 1:2.0.3-6
+- add upstream patch to fix brp-python-hardlink path
+
* Tue Aug 22 2023 Remi Collet <remi@remirepo.net> - 1:2.0.3-5
- add patch for RPM 4.19
to workaround https://bugzilla.redhat.com/2233454