[scl-utils/f20] Rebased the scl-utils:

[Jan Zeleny]

commit 9905f5b875cf42db95d6c7e2448bcf2092a78879
Author: Jan Zeleny <jzeleny at redhat.com>
Date:   Wed Oct 9 15:06:01 2013 +0200

    Rebased the scl-utils:
    
    - Correct the %_sharedstatedir macro
    - Don't install /%{_lib} when not necessary
    - Add LICENSE file
    - Add scl_source script
    - Don't change directory in %scl_install
    - Don't generate provides from sonames in the SCL root
    - Add prefix to virtual provides of SCL packages
    - Implement "--" as a command separator
    - Removed binary file scl from git tracking
    - Fixed typo
    - Added example wrapper script.

 .gitignore            |    1 +
 macros.scl-filesystem |    7 ++++++-
 scl-utils.spec        |   18 ++++++++++++++++--
 sources               |    2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ed868a3..80d2aaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /scl-utils-20121110.tar.gz
 /scl-utils-20130529.tar.gz
+/scl-utils-20131009.tar.gz
diff --git a/macros.scl-filesystem b/macros.scl-filesystem
index 78b3ce5..eb2ea04 100644
--- a/macros.scl-filesystem
+++ b/macros.scl-filesystem
@@ -1,4 +1,6 @@
 %scl_files %{expand:
+%defattr(-,root,root,-)
+%dir %_scl_prefix
 %dir %attr(555,root,root) %{_scl_root}
 %dir %attr(555,root,root) %{_scl_scripts}
 %{_scl_scripts}/enable
@@ -262,7 +264,7 @@ H
 EOF
 mkdir -p %{buildroot}%{_scl_root}
 rm -f $RPM_BUILD_DIR/%{buildsubdir}/filesystem
-cd %{buildroot}%{_scl_root}
+pushd %{buildroot}%{_scl_root}
 mkdir -p boot dev \\
         etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \\
         home media mnt opt proc root run/lock srv sys tmp \\
@@ -273,7 +275,9 @@ ln -snf spool/mail var/mail
 ln -snf usr/bin bin
 ln -snf usr/sbin sbin
 ln -snf usr/lib lib
+%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
 ln -snf usr/%{_lib} %{_lib}
+%endif
 sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml >%{buildroot}/iso_639.tab
 sed -n -f %{buildroot}/iso_3166.sed /usr/share/xml/iso-codes/iso_3166.xml >%{buildroot}/iso_3166.tab
 grep -v "^$" %{buildroot}/iso_639.tab | grep -v "^#" | while read a b c d ; do
@@ -321,4 +325,5 @@ for i in man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}; do
    echo "%{_scl_root}/usr/share/man/$i" >> $RPM_BUILD_DIR/%{buildsubdir}/filesystem
 done
 set -x
+popd
 }
diff --git a/scl-utils.spec b/scl-utils.spec
index 87b747d..3de8b5c 100644
--- a/scl-utils.spec
+++ b/scl-utils.spec
@@ -1,7 +1,7 @@
 Summary:	Utilities for alternative packaging
 Name:		scl-utils
-Version:	20130529
-Release:	3%{?dist}
+Version:	20131009
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/File
 URL:		https://fedorahosted.org/released/scl-utils/
@@ -56,6 +56,7 @@ rm -rf %buildroot
 %{_bindir}/scl_enabled
 %{_mandir}/man1/*
 %{_sysconfdir}/bash_completion.d/scl.bash
+%doc LICENSE
 
 %{!?_rpmconfigdir:%global _rpmconfigdir /usr/lib/rpm}
 %files build
@@ -68,6 +69,19 @@ rm -rf %buildroot
 %{_rpmconfigdir}/brp-scl-python-bytecompile
 
 %changelog
+* Wed Oct 09 2013 Jan Zeleny <jzeleny at redhat.com> - 20131009-1
+- Correct the %_sharedstatedir macro
+- Don't install /%{_lib} when not necessary
+- Add LICENSE file
+- Add scl_source script
+- Don't change directory in %scl_install
+- Don't generate provides from sonames in the SCL root
+- Add prefix to virtual provides of SCL packages
+- Implement "--" as a command separator
+- Removed binary file scl from git tracking
+- Fixed typo
+- Added example wrapper script.
+
 * Mon Aug 26 2013 Jan Zeleny <jzeleny at redhat.com> - 20130529-3
 - updated the file list to handle /etc/scl/conf correctly
 
diff --git a/sources b/sources
index 801300a..aeab3a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e11fb0c27c8c04f72b4a1459be1d27f2  scl-utils-20130529.tar.gz
+82f2edcf686c2eb52a0868eb923f6959  scl-utils-20131009.tar.gz