[scl-utils] - Requires: iso-codes for basic filesystem in build subpackage - add scl_require_package() macro to

[Jindrich Novy]

commit f6491d184d4aafb81372809a32c07998e35f400b
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Thu Jun 14 11:13:42 2012 +0200

    - Requires: iso-codes for basic filesystem in build subpackage
    - add scl_require_package() macro to depend on a particular package
      from the collection
    - fix filesystem file list
    - tighten runtime package dependency via scl_require()
    - fix _localstatedir to point to the correct path according to redhat-rpm-config
    - thanks to Bohuslav Kabrda for feature proposals/QA/fixes

 .gitignore            |    2 +-
 macros.scl            |    7 ++++---
 macros.scl-filesystem |    2 +-
 scl-utils.spec        |   12 +++++++++++-
 sources               |    2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 877d1e1..5735897 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /scl
 /scl.o
 /scl.1
-/scl-utils-20120503.tar.gz
+/scl-utils-20120613.tar.gz
diff --git a/macros.scl b/macros.scl
index cedf2df..8dbe93a 100644
--- a/macros.scl
+++ b/macros.scl
@@ -19,7 +19,7 @@
 %global _root_datadir		%{_prefix}/share
 %global _root_sysconfdir	%{_sysconfdir}
 %global _root_sharedstatedir	%{_prefix}/com
-%global _root_localstatedir	%{_prefix}/var
+%global _root_localstatedir	%{_localstatedir}
 %global _root_libdir		%{_exec_prefix}/%{_lib}
 %global _root_includedir	%{_prefix}/include
 %global _root_infodir		%{_datadir}/info
@@ -33,7 +33,7 @@
 %global _datadir		%{_prefix}/share
 %global _sysconfdir		%{_scl_root}/etc
 %global _sharedstatedir		%{_prefix}/com
-%global _localstatedir		%{_prefix}/var
+%global _localstatedir		%{_scl_root}/var
 %global _libdir			%{_exec_prefix}/%{_lib}
 %global _includedir		%{_prefix}/include
 %global _infodir		%{_datadir}/info
@@ -44,5 +44,6 @@
 BuildRequires: scl-utils-build
 }}
 
-%scl_require()	%{_scl_prefix}/%1/enable
+%scl_require()	%{_scl_prefix}/%1/enable, %1
+%scl_require_package() %1-%2
 
diff --git a/macros.scl-filesystem b/macros.scl-filesystem
index 758eded..3251e57 100644
--- a/macros.scl-filesystem
+++ b/macros.scl-filesystem
@@ -1,6 +1,6 @@
 %scl_files %{expand:
 %dir %attr(555,root,root) %{_scl_root}
-%{_scl_scripts}
+%dir %attr(555,root,root) %{_scl_scripts}
 %{_scl_scripts}/enable
 %{_root_sysconfdir}/scl/prefixes/%scl
 %{_scl_root}/bin
diff --git a/scl-utils.spec b/scl-utils.spec
index 6c305d1..52e1bfe 100644
--- a/scl-utils.spec
+++ b/scl-utils.spec
@@ -1,6 +1,6 @@
 Summary:	Utilities for alternative packaging
 Name:		scl-utils
-Version:	20120503
+Version:	20120613
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/File
@@ -15,6 +15,7 @@ Run-time utility for alternative packaging.
 %package build
 Summary:	RPM build macros for alternative packaging
 Group:		Applications/File
+Requires:	iso-codes
 
 %description build
 Essential RPM build macros for alternative packaging.
@@ -51,6 +52,15 @@ rm -rf %buildroot
 %{_sysconfdir}/rpm/macros.scl
 
 %changelog
+* Wed Jun 13 2012 Jindrich Novy <jnovy at redhat.com> 20120613-1
+- Requires: iso-codes for basic filesystem in build subpackage
+- add scl_require_package() macro to depend on a particular package
+  from the collection
+- fix filesystem file list
+- tighten runtime package dependency via scl_require()
+- fix _localstatedir to point to the correct path according to redhat-rpm-config
+- thanks to Bohuslav Kabrda for feature proposals/QA/fixes
+
 * Thu May 03 2012 Jindrich Novy <jnovy at redhat.com> 20120503-1
 - avoid doublefree corruption when reading commands from stdin
 
diff --git a/sources b/sources
index 988d925..1c690eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2feea7953d0a4bd625781b39afd30df0  scl-utils-20120503.tar.gz
+c21ef8094140752052f83d90d176a0b5  scl-utils-20120613.tar.gz