[mingw-qwt] Use the correct qmake macros to build this package

epienbro epienbro at fedoraproject.org
Fri Mar 9 22:45:30 UTC 2012


commit 3ba59027fdab09021bcc69a6a7dba61247cc9488
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Mar 9 23:45:21 2012 +0100

    Use the correct qmake macros to build this package

 mingw-qwt.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/mingw-qwt.spec b/mingw-qwt.spec
index 37b0b35..040c3b7 100644
--- a/mingw-qwt.spec
+++ b/mingw-qwt.spec
@@ -8,7 +8,7 @@
 Name:           mingw-%{name1}
 Summary:        MinGW Windows Qwt library
 Version:        5.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 URL:            http://qwt.sourceforge.net
 License:        LGPLv2 with exceptions
 Group:          Development/Libraries
@@ -54,10 +54,9 @@ sed -i "s\ *#CONFIG *+= *debug_and_release\CONFIG += debug_and_release\1" qwtcon
 
 
 %build
-export QMAKESPEC=fedora-win32-cross
-qmake-qt4 -win32 QT_LIBINFIX=4
+%mingw32_qmake_qt4
 #parallel build fails sometime so I disable it
-make QMAKE=qmake-qt4
+make
 pushd src
 perl -i -pe 's,4d,d4,g' Makefile.Debug
 make debug
@@ -84,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}/%{name1}
 %{mingw32_libdir}/lib%{name1}d5.a
 
 %changelog
+* Fri Mar 09 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.1-7
+- Use the correct qmake macros to build this package
+
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 5.2.1-6
 - Renamed the source package to mingw-qwt (#801020)
 - Modernize the spec file


More information about the scm-commits mailing list