- Apply rh layout fixes from Remi Collet

- Resolves:  #1198693

0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch

@@ -0,0 +1,31 @@
+From c0315dd54bc94c2acf4e4dcf0a72ca42a1cfde60 Mon Sep 17 00:00:00 2001
+From: Lubos Kardos <lkardos@redhat.com>
+Date: Wed, 9 Mar 2016 16:11:56 +0100
+Subject: [PATCH] Scl utils layout patch from fedora@famillecollet.com
+ (#1198693)
+
+---
+ rpm/macros.scl | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/rpm/macros.scl b/rpm/macros.scl
+index 1246fde..41c6be4 100644
+--- a/rpm/macros.scl
++++ b/rpm/macros.scl
+@@ -69,10 +69,13 @@ package or when debugging this package.
+ %global _datadir		%{_prefix}/share
+ %global _sysconfdir		%{_scl_root}/etc
+ %{?nfsmountable:		%global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/scls/%{scl}}
++%{?rh_layout:			%global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/%{scl}}
+ %global _sharedstatedir		%{_scl_root}/var/lib
+ %{?nfsmountable:		%global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}/lib}
++%{?rh_layout:			%global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}/lib}
+ %global _localstatedir		%{_scl_root}/var
+ %{?nfsmountable:		%global _localstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}}
++%{?rh_layout:			%global _localstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}}
+ %global _libdir			%{_exec_prefix}/%{_lib}
+ %global _includedir		%{_prefix}/include
+ %global _infodir		%{_datadir}/info
+-- 
+1.9.3
+

macros.scl-filesystem

@@ -104,6 +104,8 @@ cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF
 %%%%scl %scl
 %{?nfsmountable:%%%%nfsmountable %{nfsmountable}}
 %{!?nfsmountable:%%%%undefine nfsmountable}
+%{?rh_layout:%%%%rh_layout %{rh_layout}}
+%{!?rh_layout:%%%%undefine rh_layout}
 EOF
 cat >> %{buildroot}%{_root_sysconfdir}/scl/prefixes/%{scl} << EOF
 %_scl_prefix

scl-utils.spec

@@ -3,7 +3,7 @@
 Name:       scl-utils
 Epoch:      1
 Version:    2.0.1
-Release:    9%{dist}
+Release:    10%{dist}
 Summary:    Utilities for alternative packaging
 
 License:    GPLv2+
@@ -17,6 +17,7 @@ Requires:   environment-modules
 
 Patch1:     0001-Honor-CFLAGS-passed-to-cmake.patch
 Patch2:     0002-Fix-core-dumps-with-large-input-on-stdin-rhbz-125727.patch
+Patch3:     0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch
 
 %description
 Run-time utility for alternative packaging.
@@ -79,6 +80,9 @@ rm -rf %buildroot
 %{_rpmconfigdir}/brp-scl-python-bytecompile
 
 %changelog
+* Wed Mar 09 2016 Lubos Kardos <lkardos@redhat.com> -1:2.0.1-10
+- apply rh layout fixes from Remi Collet (#1198693)
+
 * Mon Mar  7 2016 Remi Collet <remi@fedoraproject.org> - 1:2.0.1-9
 - fix grep usage in macros.scl #1315051