From 212b8d475a781608c1d556088d1a90ce168c212b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Jan 2020 11:05:29 -0500 Subject: [PATCH] import scl-utils-2.0.2-11.el8 --- SOURCES/0004-define-macro-python-explicitly.patch | 11 +++++++++++ SPECS/scl-utils.spec | 14 +++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0004-define-macro-python-explicitly.patch diff --git a/SOURCES/0004-define-macro-python-explicitly.patch b/SOURCES/0004-define-macro-python-explicitly.patch new file mode 100644 index 0000000..463cd80 --- /dev/null +++ b/SOURCES/0004-define-macro-python-explicitly.patch @@ -0,0 +1,11 @@ +--- scl-utils-2.0.2/rpm/macros.scl.old 2019-07-04 09:27:29.887470341 +0200 ++++ scl-utils-2.0.2/rpm/macros.scl 2019-07-30 10:24:32.536648421 +0200 +@@ -93,7 +93,7 @@ + /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} + } + /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-scl-python-bytecompile %{__python3} %{?_python_bytecompile_errors_terminate_build} %{_scl_root} + /usr/lib/rpm/brp-python-hardlink + %{nil}} + BuildRequires: scl-utils-build diff --git a/SPECS/scl-utils.spec b/SPECS/scl-utils.spec index 371c0c4..b9d166f 100644 --- a/SPECS/scl-utils.spec +++ b/SPECS/scl-utils.spec @@ -3,7 +3,7 @@ Name: scl-utils Epoch: 1 Version: 2.0.2 -Release: 8%{dist} +Release: 11%{?dist} Summary: Utilities for alternative packaging License: GPLv2+ @@ -17,6 +17,7 @@ Buildrequires: rpm-devel Requires: %{_bindir}/modulecmd Patch1: 0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch +Patch2: 0004-define-macro-python-explicitly.patch %description Run-time utility for alternative packaging. @@ -79,6 +80,17 @@ ln -s prefixes conf %{_rpmconfigdir}/brp-scl-python-bytecompile %changelog +* Fri Aug 16 2019 Pavlina Moravcova Varekova - 1:2.0.2-11 +- reverted sci-utils-build own the pkgconfig directory (#1431962) + +* Tue Jul 30 2019 Pavlina Moravcova Varekova - 1:2.0.2-10 +- use %%__python3 instead of macro %%__python (#1733526) +- corrected unescaped per-cent character in the changelog (#1734103) + +* Tue Jul 02 2019 Pavlina Moravcova Varekova - 1:2.0.2-9 +- use %%{?dist} instead of %%{dist} (#1725774) +- scl-utils-build own the pkgconfig directory by %%scl_files (#1431962) + * Wed May 22 2019 Pavlina Moravcova Varekova - 1:2.0.2-8 - Own directory /etc/scl (#1616405)