More catching up with the upstream

- propagate the %nfsmountable into -build subpackage content
- use vendor prefix in the names of the packages if required

0004-Use-vendor-in-package-names-if-required.patch

@@ -0,0 +1,39 @@
+From 7adf1f898cb1890164ec39ff74ea52a5413d6016 Mon Sep 17 00:00:00 2001
+From: Jan Zeleny <jzeleny@redhat.com>
+Date: Fri, 12 Dec 2014 13:16:16 +0100
+Subject: [PATCH] Use vendor in package names if required
+
+---
+ macros.scl | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/macros.scl b/macros.scl
+index aaa7a809ab33f266f915554275a4566abf3505e3..8a8ffab756f937c0fc1857cab5fccc1428259c7d 100644
+--- a/macros.scl
++++ b/macros.scl
+@@ -41,10 +41,12 @@ package or when debugging this package.
+ %scl_package() %{expand:%{!?_root_prefix:
+ %global pkg_name		%1
+ %global scl_name		%{scl}
+-%global scl_runtime		%{scl}-runtime
+ %global scl_basedir		/opt
+ %{!?scl_vendor:			%global scl_vendor rh}
+ %{!?_scl_prefix:		%global _scl_prefix %{scl_basedir}/%{scl_vendor}}
++%global scl_meta_name		%{?scl_vendor_in_name:%{scl_vendor}-}%{scl}
++%global scl_full_prefix		%{scl_meta_name}-
++%global scl_runtime		%{scl_meta_name}-runtime
+ %global _scl_scripts		%{_scl_prefix}/%{scl}
+ %global _scl_root		%{_scl_prefix}/%{scl}/root
+ %global _root_prefix		%{_prefix}
+@@ -81,7 +83,7 @@ package or when debugging this package.
+ %global _docdir			%{_datadir}/doc
+ %global _defaultdocdir		%{_docdir}
+ }
+-%global scl_pkg_name		%{scl}-%{pkg_name}
++%global scl_pkg_name		%{scl_full_prefix}%{pkg_name}
+ %scl_debug
+ %global __os_install_post %{expand:
+     /usr/lib/rpm/brp-scl-compress %{_scl_root}
+-- 
+1.9.3
+

macros.scl-filesystem

@@ -98,9 +98,12 @@
 %scl_install %{expand:
 # scl specific stuff
 mkdir -p %{buildroot}%{_root_sysconfdir}/{rpm,scl/prefixes}
-echo -n '%' > %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config
 cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF
-scl %scl
+%%%%scl %scl
+%{?nfsmountable:%%%%nfsmountable %{nfsmountable}}
+%{!?nfsmountable:%%%%undefine nfsmountable}
+%{?scl_vendor_in_name:%%%%scl_vendor_in_name %{scl_vendor_in_name}}
+%{!?scl_vendor_in_name:%%%%undefine scl_vendor_in_name}
 EOF
 cat >> %{buildroot}%{_root_sysconfdir}/scl/prefixes/%{scl} << EOF
 %_scl_prefix

scl-utils.spec

@@ -1,13 +1,16 @@
 Summary:	Utilities for alternative packaging
 Name:		scl-utils
 Version:	20140815
-Release:	3%{?dist}
+Release:	4%{?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
-%{lua: i=0; for p in posix.files() do if string.match(p, "%d+.*%.patch$") then print(string.format("Patch%u: %s\n", i, p)); i=i+1; end end}
+Patch1:     0001-Add-missing-scls-to-_sharedstatedir-_localstatedir-a.patch
+Patch2:     0002-Add-support-for-nfsmountable-macro.patch
+Patch3:     0003-Run-register-and-deregister-scriptlets-during-the-re.patch
+Patch4:     0004-Use-vendor-in-package-names-if-required.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -71,6 +74,10 @@ rm -rf %buildroot
 %{_rpmconfigdir}/brp-scl-python-bytecompile
 
 %changelog
+* Fri Dec 12 2014 Jan Zeleny <jzeleny@redhat.com> - 20140815-4
+- propagate the %nfsmountable into -build subpackage content
+- use vendor prefix in the names of the packages if required
+
 * Fri Dec 12 2014 Jan Zeleny <jzeleny@redhat.com> - 20140815-3
 - add support for register/deregister scriptlets
 - add support %nfsmountable macro