diff options
| -rw-r--r-- | macros.scl-filesystem | 2 | ||||
| -rw-r--r-- | scl-utils-layout.patch | 19 | ||||
| -rw-r--r-- | scl-utils.spec | 9 |
3 files changed, 16 insertions, 14 deletions
diff --git a/macros.scl-filesystem b/macros.scl-filesystem index 1fc96d3..3c418cd 100644 --- a/macros.scl-filesystem +++ b/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 diff --git a/scl-utils-layout.patch b/scl-utils-layout.patch index 475fefa..c164f98 100644 --- a/scl-utils-layout.patch +++ b/scl-utils-layout.patch @@ -1,18 +1,17 @@ diff -up rpm/macros.scl.orig rpm/macros.scl ---- rpm/macros.scl.orig 2015-06-24 06:50:17.000000000 +0200 -+++ rpm/macros.scl 2015-06-24 06:50:22.000000000 +0200 -@@ -68,11 +68,11 @@ package or when debugging this package. - %global _libexecdir %{_exec_prefix}/libexec +--- rpm/macros.scl.orig 2015-06-24 07:26:39.838044392 +0200 ++++ rpm/macros.scl 2015-06-24 07:34:13.762968582 +0200 +@@ -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}} -+%{?nfsmountable: %global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/%{scl}} + %{?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} -+%{?nfsmountable: %global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}/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}} -+%{?nfsmountable: %global _localstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}} + %{?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 diff --git a/scl-utils.spec b/scl-utils.spec index 1e0318e..dd5a04c 100644 --- a/scl-utils.spec +++ b/scl-utils.spec @@ -1,7 +1,7 @@ Name: scl-utils Epoch: 1 Version: 2.0.1 -Release: 2%{dist} +Release: 3%{dist} Summary: Utilities for alternative packaging License: GPLv2+ @@ -75,9 +75,10 @@ rm -rf %buildroot %{_rpmconfigdir}/brp-scl-python-bytecompile %changelog -* Wed Jun 24 2015 Remi Collet <remi@remirepo.net> - 1:2.0.1-2 -- remove /scls/ from _sysconfdir, _sharedstatedir - and _localstatedir, in sync with RHEL version +* Wed Jun 24 2015 Remi Collet <remi@remirepo.net> - 1:2.0.1-3 +- add "rh_layout" to remove /scls/ from _sysconfdir, + _sharedstatedir and _localstatedir, in sync with RHEL version + see #1198693 * Wed Jan 21 2015 Lubos Kardos <lkardos@redhat.com> - 1:2.0.1-2 - added owning of module file |