Added owning of module file.

This commit is contained in:
Lubos Kardos 2015-01-21 10:36:07 +01:00
parent dd6754aab0
commit 7794daf129
2 changed files with 8 additions and 4 deletions

View File

@ -4,6 +4,8 @@
%dir %attr(555,root,root) %{_scl_root} %dir %attr(555,root,root) %{_scl_root}
%dir %attr(555,root,root) %{_scl_scripts} %dir %attr(555,root,root) %{_scl_scripts}
%{_scl_scripts}/enable %{_scl_scripts}/enable
%{_scl_scripts}/%{scl}
%{_root_sysconfdir}/scl/modulefiles/%{scl}
%{_root_sysconfdir}/scl/prefixes/%scl %{_root_sysconfdir}/scl/prefixes/%scl
%{_scl_root}/bin %{_scl_root}/bin
%attr(555,root,root) %{_scl_root}/boot %attr(555,root,root) %{_scl_root}/boot
@ -97,17 +99,16 @@
%scl_install %{expand: %scl_install %{expand:
# scl specific stuff # 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 cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF
%%%%scl %scl %%%%scl %scl
%{?nfsmountable:%%%%nfsmountable %{nfsmountable}} %{?nfsmountable:%%%%nfsmountable %{nfsmountable}}
%{!?nfsmountable:%%%%undefine 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 EOF
cat >> %{buildroot}%{_root_sysconfdir}/scl/prefixes/%{scl} << EOF cat >> %{buildroot}%{_root_sysconfdir}/scl/prefixes/%{scl} << EOF
%_scl_prefix %_scl_prefix
EOF EOF
ln -s %{_scl_scripts}/%{scl} %{buildroot}%{_root_sysconfdir}/scl/modulefiles/%{scl}
# filelist # filelist
set +x set +x
cat >> %{buildroot}/lang-exceptions << EOF cat >> %{buildroot}/lang-exceptions << EOF

View File

@ -1,7 +1,7 @@
Name: scl-utils Name: scl-utils
Epoch: 1 Epoch: 1
Version: 2.0.1 Version: 2.0.1
Release: 1%{dist} Release: 2%{dist}
Summary: Utilities for alternative packaging Summary: Utilities for alternative packaging
License: GPLv2+ License: GPLv2+
@ -69,6 +69,9 @@ rm -rf %buildroot
%{_rpmconfigdir}/brp-scl-python-bytecompile %{_rpmconfigdir}/brp-scl-python-bytecompile
%changelog %changelog
* Wed Jan 21 2015 Lubos Kardos <lkardos@redhat.com> - 1:2.0.1-2
- added owning of module file
* Tue Jan 20 2015 Lubos Kardos <lkardos@redhat.com> - 1:2.0.1-1 * Tue Jan 20 2015 Lubos Kardos <lkardos@redhat.com> - 1:2.0.1-1
- rebase to scl-utils-2.0.1 - rebase to scl-utils-2.0.1
- escaped macros in changelog - escaped macros in changelog