rpms/scl-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import scl-utils-2.0.2-11.el8

Browse Source
This commit is contained in:
CentOS Sources 2019-11-05 14:40:11 -05:00 committed by Andrew Lukoshko
parent ff82a85f36
commit 1995401574
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SOURCES/0004-define-macro-python-explicitly.patch Normal file
View File

@ -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

18
SPECS/scl-utils.spec
View File

@ -3,7 +3,7 @@
Name: scl-utils Name: scl-utils
Epoch: 1 Epoch: 1
Version: 2.0.2 Version: 2.0.2
Release: 7%{dist} Release: 11%{?dist}
Summary: Utilities for alternative packaging Summary: Utilities for alternative packaging
License: GPLv2+ License: GPLv2+
@ -17,6 +17,7 @@ Buildrequires: rpm-devel
Requires: %{_bindir}/modulecmd Requires: %{_bindir}/modulecmd
Patch1: 0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch Patch1: 0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch
Patch2: 0004-define-macro-python-explicitly.patch
%description %description
Run-time utility for alternative packaging. Run-time utility for alternative packaging.
@ -55,6 +56,7 @@ ln -s prefixes conf
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{_sysconfdir}/scl
%dir %{_sysconfdir}/scl/modulefiles %dir %{_sysconfdir}/scl/modulefiles
%dir %{_sysconfdir}/scl/prefixes %dir %{_sysconfdir}/scl/prefixes
%{_sysconfdir}/scl/conf %{_sysconfdir}/scl/conf
@ -78,6 +80,20 @@ ln -s prefixes conf
%{_rpmconfigdir}/brp-scl-python-bytecompile %{_rpmconfigdir}/brp-scl-python-bytecompile
%changelog %changelog
* Fri Aug 16 2019 Pavlina Moravcova Varekova <pmoravco@redhat.com> - 1:2.0.2-11
- reverted sci-utils-build own the pkgconfig directory (#1431962)
* Tue Jul 30 2019 Pavlina Moravcova Varekova <pmoravco@redhat.com> - 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 <pmoravco@redhat.com> - 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 <pmoravco@redhat.com> - 1:2.0.2-8
- Own directory /etc/scl (#1616405)
* Tue Jul 24 2018 Vít Ondruch <vondruch@redhat.com> - 1:2.0.2-7 * Tue Jul 24 2018 Vít Ondruch <vondruch@redhat.com> - 1:2.0.2-7
- Don't enforce modulefile ownership. - Don't enforce modulefile ownership.