qwt-6.1.1

.gitignore

@@ -1 +1 @@
-/qwt-6.1.0.tar.bz2
+/qwt-6.1.1.tar.bz2

qwt-6.1.0-pkgconfig.patch

@@ -1,19 +0,0 @@
-diff -up qwt-6.1.0/src/src.pro.pkgconfig qwt-6.1.0/src/src.pro
---- qwt-6.1.0/src/src.pro.pkgconfig	2013-05-30 10:18:27.693341940 -0500
-+++ qwt-6.1.0/src/src.pro	2013-10-29 10:04:22.131359701 -0500
-@@ -17,6 +17,15 @@ include( $${QWT_ROOT}/qwtfunctions.pri )
- TEMPLATE          = lib
- TARGET            = $$qwtLibraryTarget(qwt)
- 
-+# pkgconfig support
-+CONFIG     += create_pc create_prl no_install_prl
-+QMAKE_PKGCONFIG_NAME = qwt
-+QMAKE_PKGCONFIG_DESCRIPTION = Qt Widgets for Technical Applications
-+QMAKE_PKGCONFIG_LIBDIR = $${QWT_INSTALL_LIBS}
-+QMAKE_PKGCONFIG_INCDIR = $${QWT_INSTALL_HEADERS}
-+QMAKE_PKGCONFIG_REQUIRES = QtGui QtSvg
-+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-+
- DESTDIR           = $${QWT_ROOT}/lib
- 
- contains(QWT_CONFIG, QwtDll) {

qwt-6.1.1-pkgconfig.patch

@@ -0,0 +1,12 @@
+diff -up qwt-6.1.1/textengines/mathml/mathml.pro.pkgconfig qwt-6.1.1/textengines/mathml/mathml.pro
+--- qwt-6.1.1/textengines/mathml/mathml.pro.pkgconfig	2014-09-18 09:59:46.613028743 -0500
++++ qwt-6.1.1/textengines/mathml/mathml.pro	2014-09-20 14:15:54.962624868 -0500
+@@ -60,6 +60,8 @@ contains(QWT_CONFIG, QwtPkgConfig) {
+ 
+     QMAKE_PKGCONFIG_LIBDIR = $${QWT_INSTALL_LIBS}
+     QMAKE_PKGCONFIG_INCDIR = $${QWT_INSTALL_HEADERS}
++    
++    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ 
+     # QMAKE_PKGCONFIG_DESTDIR is buggy, in combination
+     # with including pri files: better don't use it

qwt.spec

@@ -4,16 +4,16 @@
 
 Name:    qwt
 Summary: Qt Widgets for Technical Applications
-Version: 6.1.0
+Version: 6.1.1
-Release: 3%{?dist}
+Release: 1%{?dist}
 
 License: LGPLv2 with exceptions
 URL:     http://qwt.sourceforge.net
 Source:  http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 
 ## upstreamable patches
-# add pkgconfig support
+# fix pkgconfig support
-Patch50: qwt-6.1.0-pkgconfig.patch
+Patch50: qwt-6.1.1-pkgconfig.patch
 # use QT_INSTALL_ paths instead of custom prefix
 Patch51: qwt-6.1.0-qt_install_paths.patch
 
@@ -53,7 +53,7 @@ BuildArch: noarch
 %patch51 -p1 -b .qt_install_paths
 
 %build
-%{?_qt4_qmake}
+%{?_qt4_qmake} QWT_CONFIG+=QwtPkgConfig
 
 make %{?_smp_mflags}
 
@@ -87,6 +87,7 @@ mv %{buildroot}%{_qt4_docdir}/html/man/man3 \
 %{_qt4_libdir}/libqwtmathml.so
 %{_qt4_libdir}/qt4/mkspecs/features/qwt*
 %{_qt4_libdir}/pkgconfig/qwt.pc
+%{_qt4_libdir}/pkgconfig/qwtmathml.pc
 
 %files doc
 # own these to avoid needless dep on qt/qt-doc
@@ -97,6 +98,9 @@ mv %{buildroot}%{_qt4_docdir}/html/man/man3 \
 
 
 %changelog
+* Sat Sep 20 2014 Rex Dieter <rdieter@fedoraproject.org> 6.1.1-1
+- qwt-6.1.1
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

sources

@@ -1 +1 @@
-aef0437b37f191067a6a9dc01c30ba64  qwt-6.1.0.tar.bz2
+fe4bdd561ef5584924e72e15bcf46b9e  qwt-6.1.1.tar.bz2