[prelink] Install macros to %{_rpmconfigdir}/macros.d where available.
Ville Skyttä
scop at fedoraproject.org
Thu Feb 13 22:14:58 UTC 2014
commit eca0d81bd03c69a4bbd8721e70500e6de7a8c6df
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Fri Feb 14 00:15:13 2014 +0200
Install macros to %{_rpmconfigdir}/macros.d where available.
https://lists.fedoraproject.org/pipermail/devel/2014-January/195026.html
prelink.spec | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/prelink.spec b/prelink.spec
index c757506..a7460ae 100644
--- a/prelink.spec
+++ b/prelink.spec
@@ -1,7 +1,9 @@
+%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+
Summary: An ELF prelinking utility
Name: prelink
Version: 0.5.0
-Release: 3%{?dist}
+Release: 4%{?dist}
%global svnver 209
License: GPLv2+
Group: System Environment/Base
@@ -47,21 +49,22 @@ echo ====================TESTING END=====================
%install
%{makeinstall}
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
+mkdir -p %{buildroot}%{_sysconfdir}
cp -a %{SOURCE2} %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_sysconfdir}/{sysconfig,cron.daily,prelink.conf.d}
cp -a %{SOURCE3} %{buildroot}%{_sysconfdir}/cron.daily/prelink
cp -a %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/prelink
chmod 755 %{buildroot}%{_sysconfdir}/cron.daily/prelink
chmod 644 %{buildroot}%{_sysconfdir}/{sysconfig/prelink,prelink.conf}
-cat > %{buildroot}%{_sysconfdir}/rpm/macros.prelink <<"EOF"
+mkdir -p %{buildroot}%{macrosdir}
+cat > %{buildroot}%{macrosdir}/macros.prelink <<"EOF"
# rpm-4.1 verifies prelinked libraries using a prelink undo helper.
# Note: The 2nd token is used as argv[0] and "library" is a
# placeholder that will be deleted and replaced with the appropriate
# library file path.
%%__prelink_undo_cmd /usr/sbin/prelink prelink -y library
EOF
-chmod 644 %{buildroot}%{_sysconfdir}/rpm/macros.prelink
+chmod 644 %{buildroot}%{macrosdir}/macros.prelink
mkdir -p %{buildroot}%{_mandir}/man5
echo '.so man8/prelink.8' > %{buildroot}%{_mandir}/man5/prelink.conf.5
chmod 644 %{buildroot}%{_mandir}/man5/prelink.conf.5
@@ -85,7 +88,7 @@ touch /var/lib/prelink/force
%doc doc/prelink.pdf
%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/prelink.conf
%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/sysconfig/prelink
-%{_sysconfdir}/rpm/macros.prelink
+%{macrosdir}/macros.prelink
%dir %attr(0755,root,root) %{_sysconfdir}/prelink.conf.d
%attr(0750,root,root) %{_sysconfdir}/cron.daily/prelink
%{_prefix}/sbin/prelink
@@ -101,6 +104,9 @@ touch /var/lib/prelink/force
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
%changelog
+* Thu Feb 13 2014 Ville Skyttä <ville.skytta at iki.fi> - 0.5.0-4
+- Install macros to %%{_rpmconfigdir}/macros.d where available.
+
* Sat Oct 5 2013 Jakub Jelinek <jakub at redhat.com> 0.5.0-3
- fix R_390_IRELATIVE handling on s390/s390x (#973259, #1010392, #1010398)
- change cron.daily/prelink permissions to rwxr-x--- (#1012538)
More information about the scm-commits
mailing list