From 36f100cc81c978049ea5e869011befe0b134a2bd163f0487e6bcbddf5552bc73 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Thu, 3 Jan 2019 17:48:35 +0000
Subject: [PATCH] Accepting request 660124 from
 home:TheBlackCat:branches:science

- Use upstream-recommended %{_rpmconfigdir}/macros.d directory for the rpm macros.

OBS-URL: https://build.opensuse.org/request/show/660124
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=94
---
 hdf5.changes | 6 ++++++
 hdf5.spec    | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hdf5.changes b/hdf5.changes
index 26a9768..cd9184d 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec 19 19:54:05 UTC 2018 - Todd R <toddrme2178@gmail.com>
+
+- Use upstream-recommended %{_rpmconfigdir}/macros.d directory
+  for the rpm macros.
+
 -------------------------------------------------------------------
 Wed Dec 12 15:28:48 UTC 2018 - Todd R <toddrme2178@gmail.com>
 
diff --git a/hdf5.spec b/hdf5.spec
index 14e1d01..cc20b87 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -578,8 +578,8 @@ mv %{buildroot}%{_prefix}/share/%{version} \
     %{buildroot}%{_prefix}/share/hdf5_examples
 %else
 # rpm macro for version checking
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cat > %{buildroot}%{_sysconfdir}/rpm/macros.hdf5 <<EOF
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
+cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.hdf5 <<EOF
 #
 # RPM macros for hdf5 packaging
 #
@@ -697,7 +697,7 @@ export HDF5_Make_Ignore=yes
 %if %{without hpc}
 %files -n %{pname}-devel-data
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/rpm/macros.hdf5
+%{_rpmconfigdir}/macros.d/macros.hdf5
 %endif
 %endif # ?mpi