[qt5-qtbase] better %rpm_macros_dir handling

Rex Dieter rdieter at fedoraproject.org
Sat Feb 1 18:48:27 UTC 2014


commit 6739b9d50fdfbe2bcd2607f0de83a24a3c53b2c2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Feb 1 12:48:57 2014 -0600

    better %rpm_macros_dir handling

 qt5-qtbase.spec |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 66851f0..f24a3c6 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -6,11 +6,7 @@
 %define qtchooser 1
 %global qt_module qtbase
 
-%if 0%{?fedora} > 18
-%define rpm_macros_dir %{_rpmconfigdir}/macros.d
-%else
-%define rpm_macros_dir %{_sysconfdir}/rpm
-%endif
+%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 # define to build docs, need to undef this for bootstrapping
 # where qt5-qttools builds are not yet available
@@ -26,7 +22,7 @@
 Summary: Qt5 - QtBase components
 Name:    qt5-qtbase
 Version: 5.2.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -688,6 +684,9 @@ popd
 
 
 %changelog
+* Sat Feb 01 2014 Rex Dieter <rdieter at fedoraproject.org> 5.2.0-11
+- better %%rpm_macros_dir handling
+
 * Wed Jan 29 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.2.0-10
 - fix the allow-forcing-llvmpipe patch to patch actual caller of __glXInitialize
 


More information about the scm-commits mailing list