diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-06-24 07:06:22 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-06-24 07:06:22 +0200 |
| commit | 6ab21ef4d83db639fd19ff1feb7d30a21745444f (patch) | |
| tree | 04765d48cc3739f9159e7df29ca4ce8fd231f5d1 | |
| parent | d8b52b9421302e62e3db22368fc191a5879b89d6 (diff) | |
scl-utils: remove /scls/ from _sysconfdir, _sharedstatedir and _localstatedir, in sync with RHEL version
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | scl-utils-layout.patch | 18 | ||||
| -rw-r--r-- | scl-utils.spec | 12 |
3 files changed, 33 insertions, 1 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1e65467 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../common/Makefile + 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 diff --git a/scl-utils.spec b/scl-utils.spec index 47bc8f2..1e0318e 100644 --- a/scl-utils.spec +++ b/scl-utils.spec @@ -9,6 +9,9 @@ Group: Applications/File URL: https://fedorahosted.org/SoftwareCollections/ Source0: https://fedorahosted.org/released/scl-utils/%{name}-%{version}.tar.bz2 Source1: macros.scl-filesystem + +Patch0: %{name}-layout.patch + Buildrequires: cmake Buildrequires: rpm-devel Requires: environment-modules @@ -26,7 +29,10 @@ Requires: redhat-rpm-config Essential RPM build macros for alternative packaging. %prep -%autosetup +%setup -q + +%patch0 -p0 + %build %cmake @@ -69,6 +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 Jan 21 2015 Lubos Kardos <lkardos@redhat.com> - 1:2.0.1-2 - added owning of module file |