From 48ee4c2b6abe1fcb5be5d6f2d31e8162ba15f096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 4 Mar 2015 21:53:30 +0200
Subject: [PATCH] Install macros in %{_rpmconfidir}/macros.d where available
 (#1074279)

---
 nodejs-packaging.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec
index 2391550..8c98861 100644
--- a/nodejs-packaging.spec
+++ b/nodejs-packaging.spec
@@ -1,6 +1,8 @@
+%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+
 Name:           nodejs-packaging
 Version:        7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        RPM Macros and Utilities for Node.js Packaging
 BuildArch:      noarch
 License:        MIT
@@ -23,7 +25,7 @@ Node.js modules and applications in RPM-based distributions.
 #nothing to do
 
 %install
-install -Dpm0644 macros.nodejs %{buildroot}%{_sysconfdir}/rpm/macros.nodejs
+install -Dpm0644 macros.nodejs %{buildroot}%{macrosdir}/macros.nodejs
 install -Dpm0644 nodejs.attr %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs.attr
 install -pm0755 nodejs.prov %{buildroot}%{_rpmconfigdir}/nodejs.prov
 install -pm0755 nodejs.req %{buildroot}%{_rpmconfigdir}/nodejs.req
@@ -32,13 +34,16 @@ install -pm0755 nodejs-fixdep %{buildroot}%{_rpmconfigdir}/nodejs-fixdep
 install -Dpm0644 multiver_modules %{buildroot}%{_datadir}/node/multiver_modules
 
 %files
-%{_sysconfdir}/rpm/macros.nodejs
+%{macrosdir}/macros.nodejs
 %{_rpmconfigdir}/fileattrs/nodejs*.attr
 %{_rpmconfigdir}/nodejs*
 %{_datadir}/node/multiver_modules
 %doc LICENSE
 
 %changelog
+* Wed Mar  4 2015 Ville Skyttä <ville.skytta@iki.fi> - 7-3
+- Install macros in %%{_rpmconfidir}/macros.d where available (#1074279)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild