[scl-utils] Rebased to 20140815

[Jan Zeleny]

commit b88a75e929b49f373ceb81c5568bbf5f74112ff2
Author: Jan Zeleny <jzeleny at redhat.com>
Date:   Tue Aug 26 16:48:04 2014 +0200

    Rebased to 20140815

 .gitignore                                         |    1 +
 ...des-scl-package-scl-for-metapackage-and-b.patch |   34 -------
 ...l-runtime-requirement-for-all-subpackages.patch |   44 ---------
 ...e-behavior-of-debuginfo-generation-proces.patch |  100 --------------------
 ...prefix-macro-that-now-accepts-a-parameter.patch |   30 ------
 ...nged-command-description-in-scl-man-pages.patch |   30 ------
 ...itional-dependencies-for-main-metapackage.patch |   30 ------
 ...Changed-script-paths-in-__os_install_post.patch |   34 -------
 scl-utils.spec                                     |   26 ++----
 sources                                            |    2 +-
 10 files changed, 10 insertions(+), 321 deletions(-)
---
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/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 <jzeleny at redhat.com> - 20140815-1
+- rebased to 20140815
+- switched to %autosetup in %prep
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 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