[drupal7] Fix macro placement.

[Jon Ciesla]

commit bd7dbcd0b0707769b15218a1abbe58ba98c660c4
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Mar 10 06:59:19 2014 -0500

    Fix macro placement.

 drupal7.spec |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/drupal7.spec b/drupal7.spec
index 6c8d2ed..8351c54 100644
--- a/drupal7.spec
+++ b/drupal7.spec
@@ -1,10 +1,13 @@
 # Disable automatic requires/provides processing
 AutoReqProv: no
 
+#rpm macros dir
+%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+
 %define drupaldir %{_datadir}/drupal7
 Name: drupal7
 Version:  7.26
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary: An open-source content-management platform
 
 Group: Applications/Publishing
@@ -139,16 +142,16 @@ mv %{buildroot}%{_sysconfdir}/%{name}/example.sites.php .
 # rpmbuild
 # RPM >= 4.9
 %if 0%{?_fileattrsdir:1}
-mkdir -p %{buildroot}%{_sysconfdir}/rpm/
-install -pm0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/rpm/macros.%{name}
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
+install -pm0644 %{SOURCE5} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
 mkdir -p %{buildroot}%{_prefix}/lib/rpm/fileattrs
 install -pm0644 %{SOURCE6} %{buildroot}%{_prefix}/lib/rpm/fileattrs/%{name}.attr
 install -pm0755 %{SOURCE7} %{buildroot}%{_prefix}/lib/rpm/%{name}.prov
 install -pm0755 %{SOURCE10} %{buildroot}%{_prefix}/lib/rpm/%{name}.req
 # RPM < 4.9
 %else
-mkdir -p %{buildroot}%{_sysconfdir}/rpm/
-install -pm0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/rpm/macros.%{name}
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
+install -pm0644 %{SOURCE8} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
 mkdir -p %{buildroot}%{_prefix}/lib/rpm/
 install -pm0755 %{SOURCE9} %{buildroot}%{_prefix}/lib/rpm/%{name}.prov
 install -pm0755 %{SOURCE11} %{buildroot}%{_prefix}/lib/rpm/%{name}.req
@@ -170,7 +173,7 @@ rm -rf %{buildroot}
 %exclude %{drupaldir}/COPYRIGHT.txt
 %exclude %{drupaldir}/README.txt
 %dir %{_sysconfdir}/%{name}
-%{_sysconfdir}/rpm/macros.drupal7
+%{_rpmconfigdir}/macros.d/macros.drupal7
 %config(noreplace) %{_sysconfdir}/%{name}/all
 %exclude %{_sysconfdir}/%{name}/README.txt
 %config(noreplace) %{_sysconfdir}/%{name}/default
@@ -183,12 +186,16 @@ rm -rf %{buildroot}
 
 %files rpmbuild
 %defattr(-,root,root,-)
-%{_sysconfdir}/rpm/macros.drupal7
+%{_rpmconfigdir}/macros.d/macros.drupal7
 %{?_fileattrsdir:%{_prefix}/lib/rpm/fileattrs/%{name}.attr}
 %{_prefix}/lib/rpm/%{name}.prov
 %{_prefix}/lib/rpm/%{name}.req
 
 %changelog
+* Mon Mar 10 2014 Jon Ciesla <limburgher at gmail.com> - 7.26-2
+- Update RPM macros location, BZ 1074272.  Should work
+- on all branches.
+
 * Wed Jan 15 2014 Jon Ciesla <limburgher at gmail.com> - 7.26-1
 - 7.26, SA-CORE-2014-001.