[fontpackages] Install macros to %{_rpmconfigdir}/macros.d where available (#1074274)

Ville Skyttä scop at fedoraproject.org
Wed Mar 4 19:45:49 UTC 2015


commit 4817d246dc2028e94ce67411e23c0584a1e3bc46
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Mar 4 21:45:39 2015 +0200

    Install macros to %{_rpmconfigdir}/macros.d where available (#1074274)
    
    - Fix bogus date in %changelog

 fontpackages.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/fontpackages.spec b/fontpackages.spec
index 71f3f54..c00fc4e 100644
--- a/fontpackages.spec
+++ b/fontpackages.spec
@@ -1,10 +1,10 @@
 %global spectemplatedir %{_sysconfdir}/rpmdevtools/
 %global ftcgtemplatedir %{_datadir}/fontconfig/templates/
-%global rpmmacrodir     %{_sysconfdir}/rpm/
+%global rpmmacrodir     %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d/)
 
 Name:    fontpackages
 Version: 1.44
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
 Group:     Development/System
@@ -140,6 +140,10 @@ rm -fr %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Wed Mar  4 2015 Ville Skyttä <ville.skytta at iki.fi> - 1.44-11
+- Install macros to %%{_rpmconfigdir}/macros.d where available (#1074274)
+- Fix bogus date in %%changelog
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.44-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -294,7 +298,7 @@ rm -fr %{buildroot}
   generate font provides for packages at build time.
   This lets us do some cool things with PackageKit in the future.
 
-* Wed Jan 22 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+* Wed Jan 21 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.16-1
 
 * Thu Jan 15 2009 Nicolas Mailhot <nim at fedoraproject dot org>


More information about the scm-commits mailing list