[mingw-qwt] update to 6.1.0

[sailer]

commit 4a59bb61ed653d5fb992c06328b048b4ba49b478
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Tue Dec 3 11:53:39 2013 +0100

    update to 6.1.0

 .gitignore     |    1 +
 mingw-qwt.spec |   59 +++++++++++++++++++++++++------------------------------
 qwt-w64.patch  |   11 ----------
 sources        |    3 +-
 4 files changed, 29 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3990c2..d698696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ qwt-5.2.0.tar.bz2
 qwt-5.2.1.tar.bz2
 /qwt-5.2.2.tar.bz2
 /qwt-6.0.1.tar.bz2
+/qwt-6.1.0.tar.bz2
diff --git a/mingw-qwt.spec b/mingw-qwt.spec
index d0ba235..df30316 100644
--- a/mingw-qwt.spec
+++ b/mingw-qwt.spec
@@ -4,13 +4,16 @@
 
 Name:           mingw-%{name1}
 Summary:        MinGW Windows Qwt library
-Version:        6.0.1
-Release:        3%{?dist}
+Version:        6.1.0
+Release:        1%{?dist}
 URL:            http://qwt.sourceforge.net
 License:        LGPLv2 with exceptions
 Group:          Development/Libraries
 Source:         http://downloads.sourceforge.net/%{name1}/%{name1}-%{version}.tar.bz2
-Patch0:         qwt-w64.patch
+# add pkgconfig support
+Patch50:        qwt-6.1.0-pkgconfig.patch
+# use QT_INSTALL_ paths instead of custom prefix
+Patch51:        qwt-6.1.0-qt_install_paths.patch
 BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw64-filesystem
 BuildRequires:  mingw32-qt
@@ -41,45 +44,34 @@ MinGW Windows Qwt library.
 %prep
 %setup -qcn %{name1}-%{version}
 pushd %{name1}-%{version}
-%patch0 -p0
+%patch50 -p1 -b .pkgconfig
+%patch51 -p1 -b .qt_install_paths
 popd
 mv %{name1}-%{version} win32
 cp -r win32 win64
-%if 0%{?mingw_build_win32} == 1
-pushd win32
-perl -i -pe 's,QWT_CONFIG\s*\+=\s*QwtDesigner,\#QWT_CONFIG     += QwtDesigner,' qwtconfig.pri
-perl -i -pe 's,QWT_INSTALL_PREFIX\s*=.*$,QWT_INSTALL_PREFIX    = %mingw32_prefix,' qwtconfig.pri
-popd
-%endif
-%if 0%{?mingw_build_win64} == 1
-pushd win64
-perl -i -pe 's,QWT_CONFIG\s*\+=\s*QwtDesigner,\#QWT_CONFIG     += QwtDesigner,' qwtconfig.pri
-perl -i -pe 's,QWT_INSTALL_PREFIX\s*=.*$,QWT_INSTALL_PREFIX    = %mingw64_prefix,' qwtconfig.pri
-popd
-%endif
 
 %build
 %if 0%{?mingw_build_win32} == 1
 pushd win32
 %mingw32_qmake_qt4
-make textengines/Makefile
+make qmake
 pushd textengines
-make mathml/Makefile
+make qmake
 popd
 perl -i -pe 's,qwt4,qwt,' textengines/mathml/Makefile.Release
-perl -i -pe 's,qwtd4,qwtd,' textengines/mathml/Makefile.Debug
+perl -i -pe 's,qwt4d,qwtd,' textengines/mathml/Makefile.Debug
 make %{?_smp_mflags}
 popd
 %endif
 %if 0%{?mingw_build_win64} == 1
 pushd win64
 %mingw64_qmake_qt4
-make textengines/Makefile
+make qmake
 pushd textengines
-make mathml/Makefile
+make qmake
 popd
 perl -i -pe 's,qwt4,qwt,' textengines/mathml/Makefile.Release
-perl -i -pe 's,qwtd4,qwtd,' textengines/mathml/Makefile.Debug
+perl -i -pe 's,qwt4d,qwtd,' textengines/mathml/Makefile.Debug
 make %{?_smp_mflags}
 popd
 %endif
@@ -89,54 +81,57 @@ popd
 pushd win32
 make INSTALL_ROOT=$RPM_BUILD_ROOT install
 popd
-rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/doc
-rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/features
-mkdir -p $RPM_BUILD_ROOT%{mingw32_includedir}/%{name1}
-mv $RPM_BUILD_ROOT%{mingw32_includedir}/*.h $RPM_BUILD_ROOT%{mingw32_includedir}/%{name1}
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc
 mkdir -p $RPM_BUILD_ROOT%{mingw32_bindir}
 mv $RPM_BUILD_ROOT%{mingw32_libdir}/*.dll $RPM_BUILD_ROOT%{mingw32_bindir}
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/qt4/plugins/designer/%{name1}_designer_plugin.dll $RPM_BUILD_ROOT%{mingw32_bindir}
 %endif
 %if 0%{?mingw_build_win64} == 1
 pushd win64
 make INSTALL_ROOT=$RPM_BUILD_ROOT install
 popd
-rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/doc
-rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/features
-mkdir -p $RPM_BUILD_ROOT%{mingw64_includedir}/%{name1}
-mv $RPM_BUILD_ROOT%{mingw64_includedir}/*.h $RPM_BUILD_ROOT%{mingw64_includedir}/%{name1}
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc
 mkdir -p $RPM_BUILD_ROOT%{mingw64_bindir}
 mv $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll $RPM_BUILD_ROOT%{mingw64_bindir}
+mv $RPM_BUILD_ROOT%{mingw64_libdir}/qt4/plugins/designer/%{name1}_designer_plugin.dll $RPM_BUILD_ROOT%{mingw64_bindir}
 %endif
 
 %files -n mingw32-%{name1}
-%doc win32/CHANGES
 %doc win32/COPYING
 %doc win32/README
 %{mingw32_bindir}/%{name1}.dll
 %{mingw32_bindir}/%{name1}d.dll
 %{mingw32_bindir}/%{name1}mathml.dll
 %{mingw32_bindir}/%{name1}mathmld.dll
+%{mingw32_bindir}/%{name1}_designer_plugin.dll
 %{mingw32_includedir}/%{name1}
 %{mingw32_libdir}/lib%{name1}.a
 %{mingw32_libdir}/lib%{name1}d.a
 %{mingw32_libdir}/lib%{name1}mathml.a
 %{mingw32_libdir}/lib%{name1}mathmld.a
+%{mingw32_datadir}/qt4/mkspecs/features/qwt*
+%{mingw32_libdir}/pkgconfig/*.pc
 
 %files -n mingw64-%{name1}
-%doc win64/CHANGES
 %doc win64/COPYING
 %doc win64/README
 %{mingw64_bindir}/%{name1}.dll
 %{mingw64_bindir}/%{name1}d.dll
 %{mingw64_bindir}/%{name1}mathml.dll
 %{mingw64_bindir}/%{name1}mathmld.dll
+%{mingw64_bindir}/%{name1}_designer_plugin.dll
 %{mingw64_includedir}/%{name1}
 %{mingw64_libdir}/lib%{name1}.a
 %{mingw64_libdir}/lib%{name1}d.a
 %{mingw64_libdir}/lib%{name1}mathml.a
 %{mingw64_libdir}/lib%{name1}mathmld.a
+%{mingw64_datadir}/qt4/mkspecs/features/qwt*
+%{mingw64_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Dec  3 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 6.1.0-1
+- update to 6.1.0
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 965a5e9..95e32ce 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-70d77e4008a6cc86763737f0f24726ca  qwt-5.2.2.tar.bz2
-ace68558eab873e2da7e641179c4ef0c  qwt-6.0.1.tar.bz2
+aef0437b37f191067a6a9dc01c30ba64  qwt-6.1.0.tar.bz2