rpms/scl-utils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Install macros in %{_rpmconfigdir}/macros.d where available (#1074284)

Browse Source
This commit is contained in:
Ville Skyttä 2015-03-04 22:11:23 +02:00
parent 7794daf129
commit 8aa6db7861
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scl-utils.spec
View File

@ -1,7 +1,9 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: scl-utils Name: scl-utils
Epoch: 1 Epoch: 1
Version: 2.0.1 Version: 2.0.1
Release: 2%{dist} Release: 3%{dist}
Summary: Utilities for alternative packaging Summary: Utilities for alternative packaging
License: GPLv2+ License: GPLv2+
@ -36,7 +38,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
cat %SOURCE1 >> %{buildroot}%{_sysconfdir}/rpm/macros.scl cat %SOURCE1 >> %{buildroot}%{macrosdir}/macros.scl
mkdir -p %{buildroot}%{_sysconfdir}/scl mkdir -p %{buildroot}%{_sysconfdir}/scl
cd %{buildroot}%{_sysconfdir}/scl cd %{buildroot}%{_sysconfdir}/scl
mkdir modulefiles mkdir modulefiles
@ -61,7 +63,7 @@ rm -rf %buildroot
%files build %files build
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_sysconfdir}/rpm/macros.scl %{macrosdir}/macros.scl
%{_rpmconfigdir}/scldeps.sh %{_rpmconfigdir}/scldeps.sh
%{_rpmconfigdir}/fileattrs/scl.attr %{_rpmconfigdir}/fileattrs/scl.attr
%{_rpmconfigdir}/fileattrs/sclbuild.attr %{_rpmconfigdir}/fileattrs/sclbuild.attr
@ -69,6 +71,9 @@ rm -rf %buildroot
%{_rpmconfigdir}/brp-scl-python-bytecompile %{_rpmconfigdir}/brp-scl-python-bytecompile
%changelog %changelog
* Wed Mar 4 2015 Ville Skyttä <ville.skytta@iki.fi> - 1:2.0.1-3
- Install macros in %%{_rpmconfigdir}/macros.d where available (#1074284)
* Wed Jan 21 2015 Lubos Kardos <lkardos@redhat.com> - 1:2.0.1-2 * Wed Jan 21 2015 Lubos Kardos <lkardos@redhat.com> - 1:2.0.1-2
- added owning of module file - added owning of module file