From 1035ccd94a4f7cabcb07475c7d4f7ed7a6161484 Mon Sep 17 00:00:00 2001 From: Albert Uchytil Date: Wed, 7 May 2014 13:02:05 +0200 Subject: [PATCH] Changed script paths in __os_install_post -required to keep up with rpm (#1093074) --- ...ed-script-paths-in-__os_install_post.patch | 34 +++++++++++++++++++ scl-utils.spec | 7 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0007-Changed-script-paths-in-__os_install_post.patch diff --git a/0007-Changed-script-paths-in-__os_install_post.patch b/0007-Changed-script-paths-in-__os_install_post.patch new file mode 100644 index 0000000..dc860d4 --- /dev/null +++ b/0007-Changed-script-paths-in-__os_install_post.patch @@ -0,0 +1,34 @@ +From 5b0fc1a378e1f7b5f61b2900cf6100393c0538fe Mon Sep 17 00:00:00 2001 +From: Albert Uchytil +Date: Wed, 7 May 2014 12:50:31 +0200 +Subject: [PATCH] Changed script paths in __os_install_post + +-required to keep up with rpm +--- + macros.scl | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/macros.scl b/macros.scl +index 55e934eb088da192a334eea2771fe3658837d132..b8dca61edb027c404009c87442902619258a9a74 100644 +--- a/macros.scl ++++ b/macros.scl +@@ -80,12 +80,12 @@ package or when debugging this package. + %scl_debug + %global __os_install_post %{expand: + /usr/lib/rpm/brp-scl-compress %{_scl_root} +- %{!?__debug_package:/usr/lib/rpm/redhat/brp-strip %{__strip} +- /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} ++ %{!?__debug_package:/usr/lib/rpm/brp-strip %{__strip} ++ /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} + } +- /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ++ /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/redhat/brp-python-hardlink ++ /usr/lib/rpm/brp-python-hardlink + %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} + %{nil}} + } +-- +1.9.0 + diff --git a/scl-utils.spec b/scl-utils.spec index b141ee5..d0674b0 100644 --- a/scl-utils.spec +++ b/scl-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for alternative packaging Name: scl-utils Version: 20140127 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/File URL: https://fedorahosted.org/SoftwareCollections/ @@ -13,6 +13,7 @@ Patch2: 0003-Modified-the-behavior-of-debuginfo-generation-proces.patch Patch3: 0004-Changed-scl_prefix-macro-that-now-accepts-a-parameter.patch Patch4: 0005-Changed-command-description-in-scl-man-pages.patch Patch5: 0006-Added-conditional-dependencies-for-main-metapackage.patch +Patch6: 0007-Changed-script-paths-in-__os_install_post.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -35,6 +36,7 @@ Essential RPM build macros for alternative packaging. %patch3 -p1 -b .debuginfo-old %patch4 -p1 -b .man-pages-old %patch5 -p1 -b .conditional-deps +%patch6 -p1 -b .macros_script_paths %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" @@ -82,6 +84,9 @@ rm -rf %buildroot %{_rpmconfigdir}/brp-scl-python-bytecompile %changelog +* Wed May 07 2014 Albert Uchytil - 20140127-5 +- changed __os_install_post script paths to keep up with rpm (#1093074) + * Fri Apr 11 2014 Albert Uchytil - 20140127-4 - reverted "-f filelist" modification - added %scl_vendor macro to macros.%{scl}-config file (#1084095)