From 6ab21ef4d83db639fd19ff1feb7d30a21745444f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Jun 2015 07:06:22 +0200 Subject: scl-utils: remove /scls/ from _sysconfdir, _sharedstatedir and _localstatedir, in sync with RHEL version --- scl-utils-layout.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 scl-utils-layout.patch (limited to 'scl-utils-layout.patch') diff --git a/scl-utils-layout.patch b/scl-utils-layout.patch new file mode 100644 index 0000000..475fefa --- /dev/null +++ b/scl-utils-layout.patch @@ -0,0 +1,18 @@ +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 + %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}} + %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} + %global _localstatedir %{_scl_root}/var +-%{?nfsmountable: %global _localstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}} ++%{?nfsmountable: %global _localstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}} + %global _libdir %{_exec_prefix}/%{_lib} + %global _includedir %{_prefix}/include + %global _infodir %{_datadir}/info -- cgit