[hdf5] Fix rpm macros install dir
Orion Poplawski
orion at fedoraproject.org
Sat Feb 1 04:47:44 UTC 2014
commit 49cc5862a1437169430d437a7b086908a84f389c
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri Jan 31 21:48:09 2014 -0700
Fix rpm macros install dir
hdf5.spec | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/hdf5.spec b/hdf5.spec
index 1c4cfbb..ad10879 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -1,3 +1,5 @@
+%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+
# Patch version?
%global snaprel %{nil}
@@ -247,8 +249,8 @@ do
done
%endif
# rpm macro for version checking
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
-cat > ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/macros.hdf5 <<EOF
+mkdir -p ${RPM_BUILD_ROOT}%{macrosdir}
+cat > ${RPM_BUILD_ROOT}%{macrosdir}/macros.hdf5 <<EOF
# HDF5 version is
%%_hdf5_version %{version}
EOF
@@ -313,7 +315,7 @@ done
%{_mandir}/man1/h5unjam.1*
%files devel
-%{_sysconfdir}/rpm/macros.hdf5
+%{macrosdir}/macros.hdf5
%{_bindir}/h5c++*
%{_bindir}/h5cc*
%{_bindir}/h5fc*
@@ -403,6 +405,9 @@ done
%changelog
+* Fri Jan 31 2014 Orion Poplawski <orion at cora.nwra.com> 1.8.12-4
+- Fix rpm macros install dir
+
* Wed Jan 29 2014 Orion Poplawski <orion at cora.nwra.com> 1.8.12-3
- Fix rpm/macros.hdf5 generation (bug #1059161)
More information about the scm-commits
mailing list