[color-filesystem] Don't install rpm macros in sysconfdir

Richard Hughes rhughes at fedoraproject.org
Sat Feb 1 19:20:43 UTC 2014


commit 8f387e61c53f46b9f6cc4c1c50120950f083677a
Author: Richard Hughes <richard at hughsie.com>
Date:   Sat Feb 1 19:21:07 2014 +0000

    Don't install rpm macros in sysconfdir

 color-filesystem.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/color-filesystem.spec b/color-filesystem.spec
index af4a5b5..d7203ab 100644
--- a/color-filesystem.spec
+++ b/color-filesystem.spec
@@ -1,6 +1,6 @@
 Name:           color-filesystem
 Version:        1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Color filesystem layout
 
 Group:          System Environment/Base
@@ -27,8 +27,8 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/color/settings
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/color/icc
 
 # rpm macros
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
-cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.color<<EOF
+mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/
+cat >$RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.color<<EOF
 %%_colordir %%_datadir/color
 %%_syscolordir %%_colordir
 %%_icccolordir %%_colordir/icc
@@ -44,9 +44,12 @@ EOF
 %dir %{_datadir}/color/settings
 %dir %{_localstatedir}/lib/color
 %dir %{_localstatedir}/lib/color/icc
-%{_sysconfdir}/rpm/macros.color
+%{_rpmconfigdir}/macros.d/macros.color
 
 %changelog
+* Sat Feb 01 2014 Richard Hughes <richard at hughsie.com> - 1-14
+- Don't install rpm macros in sysconfdir
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list