[kde-filesystem] use %{_rpmconfigdir}/macros.d/macros.kde4 (f19+)

[Rex Dieter]

commit 0091059dd88035b51ac40e69a6df1433e1d23628
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Mar 16 12:25:11 2013 -0500

    use %{_rpmconfigdir}/macros.d/macros.kde4 (f19+)

 kde-filesystem.spec |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/kde-filesystem.spec b/kde-filesystem.spec
index a81b297..e151e8b 100644
--- a/kde-filesystem.spec
+++ b/kde-filesystem.spec
@@ -14,10 +14,15 @@
 %define _kde4_buildtype release
 %define _kde4_macros_api 2
 
+%define rpm_macros_dir %{_sysconfdir}/rpm
+%if 0%{?fedora} > 18
+%define rpm_macros_dir %{_rpmconfigdir}/macros.d
+%endif
+
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 44%{?dist}
+Release: 45%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -107,7 +112,7 @@ for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
 done
 
 # rpm macros
-cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4<<EOF
+cat >$RPM_BUILD_ROOT%{rpm_macros_dir}/macros.kde4<<EOF
 %%_kde4_prefix %%_prefix
 %%_kde4_sysconfdir %%_sysconfdir
 %%_kde4_libdir %%_libdir
@@ -124,7 +129,7 @@ cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4<<EOF
 %%_kde4_buildtype %_kde4_buildtype
 %%_kde4_macros_api %_kde4_macros_api
 EOF
-cat %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
+cat %{SOURCE2} >> $RPM_BUILD_ROOT%{rpm_macros_dir}/macros.kde4
 
 
 %clean
@@ -154,7 +159,7 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 %lang(en) %{_docdir}/HTML/en/
 
 # KDE4
-%{_sysconfdir}/rpm/macros.kde4
+%{rpm_macros_dir}/macros.kde4
 %{_kde4_sysconfdir}/kde/
 %{_kde4_libexecdir}/
 %{_kde4_includedir}/
@@ -175,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %changelog
+* Sat Mar 16 2013 Rex Dieter <rdieter at fedoraproject.org> 4-45
+- use %%{_rpmconfigdir}/macros.d/macros.kde4 (f19+)
+
 * Sat Mar 09 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 4-44
 - Remove %%config from %%{_sysconfdir}/rpm/macros.*
   (https://fedorahosted.org/fpc/ticket/259).