From b88a75e929b49f373ceb81c5568bbf5f74112ff2 Mon Sep 17 00:00:00 2001 From: Jan Zeleny Date: Tue, 26 Aug 2014 16:48:04 +0200 Subject: [PATCH] Rebased to 20140815 --- .gitignore | 1 + ...cl-package-scl-for-metapackage-and-b.patch | 34 ------ ...time-requirement-for-all-subpackages.patch | 44 -------- ...avior-of-debuginfo-generation-proces.patch | 100 ------------------ ...x-macro-that-now-accepts-a-parameter.patch | 30 ------ ...command-description-in-scl-man-pages.patch | 30 ------ ...al-dependencies-for-main-metapackage.patch | 30 ------ ...ed-script-paths-in-__os_install_post.patch | 34 ------ scl-utils.spec | 26 ++--- sources | 2 +- 10 files changed, 10 insertions(+), 321 deletions(-) delete mode 100644 0001-Added-Provides-scl-package-scl-for-metapackage-and-b.patch delete mode 100644 0002-Added-scl-runtime-requirement-for-all-subpackages.patch delete mode 100644 0003-Modified-the-behavior-of-debuginfo-generation-proces.patch delete mode 100644 0004-Changed-scl_prefix-macro-that-now-accepts-a-parameter.patch delete mode 100644 0005-Changed-command-description-in-scl-man-pages.patch delete mode 100644 0006-Added-conditional-dependencies-for-main-metapackage.patch delete mode 100644 0007-Changed-script-paths-in-__os_install_post.patch diff --git a/.gitignore b/.gitignore index e4eb21c..8a2163d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /scl-utils-20131017.tar.gz /scl-utils-20140108.tar.gz /scl-utils-20140127.tar.gz +/scl-utils-20140815.tar.gz diff --git a/0001-Added-Provides-scl-package-scl-for-metapackage-and-b.patch b/0001-Added-Provides-scl-package-scl-for-metapackage-and-b.patch deleted file mode 100644 index c7192ff..0000000 --- a/0001-Added-Provides-scl-package-scl-for-metapackage-and-b.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c260cd124d5990395897637ed8bd5edb2fbe7ac6 Mon Sep 17 00:00:00 2001 -From: Albert Uchytil -Date: Mon, 3 Mar 2014 08:41:14 +0100 -Subject: [PATCH] Added Provides: scl-package(%scl) for metapackage and build - subpackage - ---- - macros.scl | 1 + - scl.attr | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/macros.scl b/macros.scl -index 9e4b0540ed75617346334816abca53f8991dece4..50f4df2e6ac09ae1de7cde5e49f7c4c82db6ef70 100644 ---- a/macros.scl -+++ b/macros.scl -@@ -73,6 +73,7 @@ package or when debugging this package. - Requires: %scl_runtime - } - BuildRequires: scl-utils-build -+Provides: scl-package(%scl) - %{?scl_package_override:%scl_package_override} - } - -diff --git a/scl.attr b/scl.attr -index 3e546568261b996e065be3bfaed648d785466c36..5f7d91f452b8ba1e29e98892d0e0145fae89e55e 100644 ---- a/scl.attr -+++ b/scl.attr -@@ -1,2 +1,2 @@ - %__scl_provides %{_rpmconfigdir}/scldeps.sh --provides %{scl} --%__scl_path %{?scl:^%{_scl_prefix}/.*$} -+%__scl_path %{?scl:^%{_scl_prefix}/.*$ || %{_root_sysconfdir}/rpm/macros.%{scl}-config$} --- -1.8.3.1 - diff --git a/0002-Added-scl-runtime-requirement-for-all-subpackages.patch b/0002-Added-scl-runtime-requirement-for-all-subpackages.patch deleted file mode 100644 index 5bfc8ef..0000000 --- a/0002-Added-scl-runtime-requirement-for-all-subpackages.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fb61e55ab3634a71d975a5d8b308d77a7a0afa1d Mon Sep 17 00:00:00 2001 -From: Albert Uchytil -Date: Tue, 25 Mar 2014 11:25:55 +0100 -Subject: [PATCH] Added scl-runtime requirement to all subpackages - ---- - macros.scl | 1 - - scl.attr | 1 + - scldeps.sh | 3 +++ - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/macros.scl b/macros.scl -index 50f4df2e6ac09ae1de7cde5e49f7c4c82db6ef70..8663198094404f7ef852aeeb84f47c4ed679a724 100644 ---- a/macros.scl -+++ b/macros.scl -@@ -79,4 +79,3 @@ Provides: scl-package(%scl) - - %scl_require() %{_scl_prefix}/%1/enable, %1 - %scl_require_package() %1-%2 -- -diff --git a/scl.attr b/scl.attr -index 5f7d91f452b8ba1e29e98892d0e0145fae89e55e..068fc4a995443340428fd75b017affed069188d3 100644 ---- a/scl.attr -+++ b/scl.attr -@@ -1,2 +1,3 @@ - %__scl_provides %{_rpmconfigdir}/scldeps.sh --provides %{scl} -+%__scl_requires %{_rpmconfigdir}/scldeps.sh --requires %{scl_runtime} - %__scl_path %{?scl:^%{_scl_prefix}/.*$ || %{_root_sysconfdir}/rpm/macros.%{scl}-config$} -diff --git a/scldeps.sh b/scldeps.sh -index 268d6bb5109f34d0e8da8c7d01816dcecffb6888..df8ddb3bb35b291de839bff0754c479958704030 100755 ---- a/scldeps.sh -+++ b/scldeps.sh -@@ -9,5 +9,8 @@ case $1 in - -P|--provides) - echo -n "scl-package($2)" - ;; -+-R|--requires) -+ echo -n "$2" -+ ;; - esac - exit 0 --- -1.8.5.3 - diff --git a/0003-Modified-the-behavior-of-debuginfo-generation-proces.patch b/0003-Modified-the-behavior-of-debuginfo-generation-proces.patch deleted file mode 100644 index c3f1dc4..0000000 --- a/0003-Modified-the-behavior-of-debuginfo-generation-proces.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 1a276e247244fdbba739a09ac93765914499dd25 Mon Sep 17 00:00:00 2001 -From: Albert Uchytil -Date: Wed, 2 Apr 2014 17:00:04 +0200 -Subject: [PATCH] Modified the behavior of debuginfo generation process - -* Removed debug package definition from macros.scl -* Added %scl_debug macro, that adds correct dependencies to debug packages. -* Added conditional definition of __debug_package macro - This change was required, to enable correct behavior for the case, when - the %debug_package is set to %{nil}. Moved %scl_debug macro call in front - of __os_install_post definition, to achieve desired macro expansion -* Removed automatic creation of debuginfo metapackage. ---- - macros.scl | 51 ++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 34 insertions(+), 17 deletions(-) - -diff --git a/macros.scl b/macros.scl -index 8663198094404f7ef852aeeb84f47c4ed679a724..598b806ab16ca3bdbff8dbf3a6c6ba1ebd2aafd6 100644 ---- a/macros.scl -+++ b/macros.scl -@@ -3,6 +3,39 @@ - # Copyright (C) 2012 Red Hat, Inc. - # Written by Jindrich Novy . - -+%scl_debug() %{expand: -+%define old_debug %{lua:print(rpm.expand("%{debug_package}"):len())} -+%global debug_package %{expand: -+%if "%{?old_debug}" == "0" -+ %{expand: %{nil}} -+%else -+%if "%{?scl}%{!?scl:0}" == "%{pkg_name}" -+ %{expand: %{nil}} -+%else -+%ifnarch noarch -+%package debuginfo -+Summary: Debug information for package %{name} -+Group: Development/Debug -+AutoReqProv: 0 -+Requires: %scl_runtime -+Provides: scl-package(%scl) -+%{lua: -+ debuginfo=tonumber(rpm.expand("%{old_debug}")) -+ if debuginfo > 0 then -+ rpm.define("__debug_package 1") -+ end -+} -+%description debuginfo -+This package provides debug information for package %{name}. -+Debug information is useful when developing applications that use this -+package or when debugging this package. -+%files debuginfo -f debugfiles.list -+%defattr(-,root,root) -+%endif -+%endif -+%endif -+%{nil}}} -+ - %scl_package() %{expand:%{!?_root_prefix: - %global pkg_name %1 - %global scl_name %{scl} -@@ -43,6 +75,7 @@ - %global _docdir %{_datadir}/doc - %global _defaultdocdir %{_docdir} - %global scl_pkg_name %{scl}-%{pkg_name} -+%scl_debug - %global __os_install_post %{expand: - /usr/lib/rpm/brp-scl-compress %{_scl_root} - %{!?__debug_package:/usr/lib/rpm/redhat/brp-strip %{__strip} -@@ -53,23 +86,6 @@ - /usr/lib/rpm/redhat/brp-python-hardlink - %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} - %{nil}} --%global debug_package %{expand: --%ifnarch noarch --%global __debug_package 1 --%package debuginfo --Summary: Debug information for package %{name} --Group: Development/Debug --AutoReqProv: 0 --Requires: %scl_runtime --Provides: scl-package(%scl) --%description debuginfo --This package provides debug information for package %{name}. --Debug information is useful when developing applications that use this --package or when debugging this package. --%files debuginfo -f debugfiles.list --%defattr(-,root,root) --%endif --%{nil}} - Requires: %scl_runtime - } - BuildRequires: scl-utils-build -@@ -79,3 +95,4 @@ Provides: scl-package(%scl) - - %scl_require() %{_scl_prefix}/%1/enable, %1 - %scl_require_package() %1-%2 -+ --- -1.9.0 - diff --git a/0004-Changed-scl_prefix-macro-that-now-accepts-a-parameter.patch b/0004-Changed-scl_prefix-macro-that-now-accepts-a-parameter.patch deleted file mode 100644 index 381d069..0000000 --- a/0004-Changed-scl_prefix-macro-that-now-accepts-a-parameter.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e92630c3e6ef2253b44429680910912671589680 Mon Sep 17 00:00:00 2001 -From: Albert Uchytil -Date: Fri, 11 Apr 2014 13:24:30 +0200 -Subject: [PATCH] Changed scl_prefix macro, that now accepts a parameter. Users - can now easily override default scl_prefix in some cases. (#1057634) - ---- - macros.scl | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/macros.scl b/macros.scl -index 45ae422705517017eaa7a20d57a15f82495350ea..f4685137301ca3a979b71ac1a934134b666837a5 100644 ---- a/macros.scl -+++ b/macros.scl -@@ -35,10 +35,11 @@ package or when debugging this package. - %endif - %{nil}}} - -+%scl_prefix() %{?scl:%(if [ "%1" = "%%1" ]; then echo "%{scl}-"; else echo "%1-"; fi)}%{!?scl:%{nil}} -+ - %scl_package() %{expand:%{!?_root_prefix: - %global pkg_name %1 - %global scl_name %{scl} --%global scl_prefix %{scl}- - %global scl_runtime %{scl}-runtime - %{!?scl_basedir: %global scl_basedir /opt} - %{!?scl_vendor: %global scl_vendor rh} --- -1.9.0 - diff --git a/0005-Changed-command-description-in-scl-man-pages.patch b/0005-Changed-command-description-in-scl-man-pages.patch deleted file mode 100644 index 0d6fa68..0000000 --- a/0005-Changed-command-description-in-scl-man-pages.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ff24defdb7ff7e0460785202933ac024f273c82f Mon Sep 17 00:00:00 2001 -From: Albert Uchytil -Date: Tue, 8 Apr 2014 14:22:29 +0200 -Subject: [PATCH] Changed description in scl man pages - ---- - scl.1 | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/scl.1 b/scl.1 -index cbefc44a7d539370065912021a62a39844a51f80..51f32e4db0f18ca6a97231ad641f78ae88806e13 100644 ---- a/scl.1 -+++ b/scl.1 -@@ -25,9 +25,10 @@ to update search paths, etc. - One can enable more Software Collections if needed and therefore one can use multiple - collections which are enabled by the left-right order as present on \fBscl\fP command-line. - .PP --\fI\fR is an arbitrary command or set of commands to execute within the Software --Collection environment enabled. Control is returned back to the caller with the original --environment as soon as the command finishes. If \fI\fR is '-' (dash) then it is -+\fI\fR marks specified Software Collections as enabled. Executes the script, -+which is expected to set proper environment. Executes the \fI\fR. -+Control is returned back to the caller with the original environment as soon -+as the command finishes. If \fI\fR is '-' (dash) then it is - read from the standard input. - .PP - Note: if you use \fI\fR consisting of multiple arguments, you either need to --- -1.9.0 - diff --git a/0006-Added-conditional-dependencies-for-main-metapackage.patch b/0006-Added-conditional-dependencies-for-main-metapackage.patch deleted file mode 100644 index f6d2965..0000000 --- a/0006-Added-conditional-dependencies-for-main-metapackage.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f6d35d3406cf57024d3fe44d308d7e11527e3551 Mon Sep 17 00:00:00 2001 -From: Albert Uchytil -Date: Wed, 2 Apr 2014 17:01:41 +0200 -Subject: [PATCH] Added conditional dependencies for main metapackage - ---- - macros.scl | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/macros.scl b/macros.scl -index ac83ae302ce971c4564c107bd0a1c769db6465e2..cd19c593002eb1c823a12b24df43196374086120 100644 ---- a/macros.scl -+++ b/macros.scl -@@ -53,10 +53,12 @@ - /usr/lib/rpm/redhat/brp-python-hardlink - %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} - %{nil}} --Requires: %scl_runtime - } - BuildRequires: scl-utils-build -+%if "%{?scl}%{!?scl:0}" == "%{pkg_name}" - Provides: scl-package(%scl) -+Requires: %scl_runtime -+%endif - %{?scl_package_override:%scl_package_override} - } - --- -1.8.5.3 - diff --git a/0007-Changed-script-paths-in-__os_install_post.patch b/0007-Changed-script-paths-in-__os_install_post.patch deleted file mode 100644 index dc860d4..0000000 --- a/0007-Changed-script-paths-in-__os_install_post.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 dd76231..16ef597 100644 --- a/scl-utils.spec +++ b/scl-utils.spec @@ -1,19 +1,12 @@ Summary: Utilities for alternative packaging Name: scl-utils -Version: 20140127 -Release: 7%{?dist} +Version: 20140815 +Release: 1%{?dist} License: GPLv2+ Group: Applications/File URL: https://fedorahosted.org/SoftwareCollections/ Source0: https://fedorahosted.org/released/scl-utils/%{name}-%{version}.tar.gz Source1: macros.scl-filesystem -Patch0: 0001-Added-Provides-scl-package-scl-for-metapackage-and-b.patch -Patch1: 0002-Added-scl-runtime-requirement-for-all-subpackages.patch -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 @@ -29,14 +22,7 @@ Requires: redhat-rpm-config Essential RPM build macros for alternative packaging. %prep -%setup -q -%patch0 -p1 -b .provides-scl-package -%patch1 -p1 -b .requires-scl-package -%patch2 -p1 -b .scl-prefix-old -%patch3 -p1 -b .debuginfo-old -%patch4 -p1 -b .man-pages-old -%patch5 -p1 -b .conditional-deps -%patch6 -p1 -b .macros_script_paths +%autosetup %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" @@ -76,14 +62,18 @@ rm -rf %buildroot %{!?_rpmconfigdir:%global _rpmconfigdir /usr/lib/rpm} %files build %defattr(-,root,root,-) -%{_bindir}/sclbuild %{_sysconfdir}/rpm/macros.scl %{_rpmconfigdir}/scldeps.sh %{_rpmconfigdir}/fileattrs/scl.attr +%{_rpmconfigdir}/fileattrs/sclbuild.attr %{_rpmconfigdir}/brp-scl-compress %{_rpmconfigdir}/brp-scl-python-bytecompile %changelog +* Tue Aug 26 2014 Jan Zeleny - 20140815-1 +- rebased to 20140815 +- switched to %autosetup in %prep + * Mon Aug 18 2014 Fedora Release Engineering - 20140127-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 8a7d419..ed4c510 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9e0ed5d3a2bfe98432e88bcfea3947d scl-utils-20140127.tar.gz +9b8c2ee9aebdd96f7f7a87338c3d436f scl-utils-20140815.tar.gz