[qwt/f21] fix build where %%qmake_qt5 isn't available (yet)

Rex Dieter rdieter at fedoraproject.org
Mon Dec 1 18:30:14 UTC 2014


commit 573b35a48bb825306265b73bd6e4173b91bfbe72
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 1 12:29:55 2014 -0600

    fix build where %%qmake_qt5 isn't available (yet)

 qwt.spec |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/qwt.spec b/qwt.spec
index 37f0550..23bf124 100644
--- a/qwt.spec
+++ b/qwt.spec
@@ -94,7 +94,7 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
 %if 0%{?qt5}
 mkdir %{_target_platform}-qt5
 pushd %{_target_platform}-qt5
-%{qmake_qt5} QWT_CONFIG+=QwtPkgConfig ..
+%{?qmake_qt5}%{?!qmake_qt5:%{_qt5_qmake}} QWT_CONFIG+=QwtPkgConfig ..
 
 make %{?_smp_mflags}
 popd
@@ -184,7 +184,6 @@ cp -alf %{buildroot}%{_qt4_docdir}/html/qwt/ \
 %endif
 
 
-
 %changelog
 * Mon Dec 01 2014 Rex Dieter <rdieter at fedoraproject.org> - 6.1.1-3
 - %%build: use %%qmake-qt? macro variant


More information about the scm-commits mailing list