[scl-utils/f20] Added owning of module file.
Ľuboš Kardoš
lkardos at fedoraproject.org
Wed Jan 21 09:56:18 UTC 2015
commit 10a474d5dd4b34bc7c421042e952e51cb6f4041d
Author: Lubos Kardos <lkardos at redhat.com>
Date: Wed Jan 21 10:36:07 2015 +0100
Added owning of module file.
macros.scl-filesystem | 7 ++++---
scl-utils.spec | 5 ++++-
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/macros.scl-filesystem b/macros.scl-filesystem
index 45a5bd3..1fc96d3 100644
--- a/macros.scl-filesystem
+++ b/macros.scl-filesystem
@@ -4,6 +4,8 @@
%dir %attr(555,root,root) %{_scl_root}
%dir %attr(555,root,root) %{_scl_scripts}
%{_scl_scripts}/enable
+%{_scl_scripts}/%{scl}
+%{_root_sysconfdir}/scl/modulefiles/%{scl}
%{_root_sysconfdir}/scl/prefixes/%scl
%{_scl_root}/bin
%attr(555,root,root) %{_scl_root}/boot
@@ -97,17 +99,16 @@
%scl_install %{expand:
# scl specific stuff
-mkdir -p %{buildroot}%{_root_sysconfdir}/{rpm,scl/prefixes}
+mkdir -p %{buildroot}%{_root_sysconfdir}/{rpm,scl/{prefixes,modulefiles}}
cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF
%%%%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
EOF
+ln -s %{_scl_scripts}/%{scl} %{buildroot}%{_root_sysconfdir}/scl/modulefiles/%{scl}
# filelist
set +x
cat >> %{buildroot}/lang-exceptions << EOF
diff --git a/scl-utils.spec b/scl-utils.spec
index 4b608fe..cb82d6c 100644
--- a/scl-utils.spec
+++ b/scl-utils.spec
@@ -1,7 +1,7 @@
Name: scl-utils
Epoch: 1
Version: 2.0.1
-Release: 1%{dist}
+Release: 2%{dist}
Summary: Utilities for alternative packaging
License: GPLv2+
@@ -69,6 +69,9 @@ rm -rf %buildroot
%{_rpmconfigdir}/brp-scl-python-bytecompile
%changelog
+* Wed Jan 21 2015 Lubos Kardos <lkardos at redhat.com> - 1:2.0.1-2
+- added owning of module file
+
* Tue Jan 20 2015 Lubos Kardos <lkardos at redhat.com> - 1:2.0.1-1
- rebase to scl-utils-2.0.1
- escaped macros in changelog
More information about the scm-commits
mailing list