[mingw-qwt: 12/21] update to 5.2.1

[Kalev Lember]

commit 332a6bf75556efddafc857fc4cebb098f18e7a72
Author: sailer <sailer at fedoraproject.org>
Date:   Sun Apr 25 22:54:00 2010 +0000

    update to 5.2.1

 .cvsignore       |    1 +
 mingw32-qwt.spec |   11 +++++++----
 qwt-path.patch   |   16 ++++++++--------
 sources          |    2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index d057df7..5993ab5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 qwt-5.1.1.tar.bz2
 qwt-5.2.0.tar.bz2
+qwt-5.2.1.tar.bz2
diff --git a/mingw32-qwt.spec b/mingw32-qwt.spec
index 0827f29..12a9163 100644
--- a/mingw32-qwt.spec
+++ b/mingw32-qwt.spec
@@ -3,8 +3,8 @@
 
 Name:           mingw32-%{name1}
 Summary:        MinGW Windows Qwt library
-Version:        5.2.0
-Release:        3%{?dist}
+Version:        5.2.1
+Release:        1%{?dist}
 URL:            http://qwt.sourceforge.net
 License:        LGPLv2 with exceptions
 Group:          Development/Libraries
@@ -35,7 +35,7 @@ MinGW Windows Qwt library.
 %prep
 %setup -qn %{name1}-%{version}
 %patch0 -p1
-%patch1 -p0 -b .qhash
+#patch1 -p0 -b .qhash
 sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_mingw32_libdir}\1" qwtconfig.pri
 sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_mingw32_includedir}/%{name1}\1" qwtconfig.pri
 sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_mingw32_docdir}/%{name1}\1" qwtconfig.pri
@@ -54,7 +54,7 @@ sed -i "s\ *#CONFIG *+= *debug_and_release\CONFIG += debug_and_release\1" qwtcon
 export QMAKESPEC=fedora-win32-cross
 qmake-qt4 -win32 QT_LIBINFIX=4
 #parallel build fails sometime so I disable it
-make
+make QMAKE=qmake-qt4
 pushd src
 perl -i -pe 's,4d,d4,g' Makefile.Debug
 make debug
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/lib%{name1}d5.a
 
 %changelog
+* Fri Apr 23 2010 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.2.1-1
+- update to 5.2.1
+
 * Sat Feb 13 2010 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.2.0-3
 - qt 4.6.1 compile workaround
 
diff --git a/qwt-path.patch b/qwt-path.patch
index f8d2e04..62df83c 100644
--- a/qwt-path.patch
+++ b/qwt-path.patch
@@ -10,19 +10,19 @@ diff -Nur qwt-5.1.1.org/designer/designer.pro qwt-5.1.1/designer/designer.pro
          INSTALLS += target
      }
  }
-diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
---- qwt-5.1.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
-+++ qwt-5.1.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
+diff -Nur qwt-5.2.1.org/qwtconfig.pri qwt-5.2.1/qwtconfig.pri
+--- qwt-5.2.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.2.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
 @@ -7,17 +7,9 @@
- VER_PAT      = 0
+ VER_PAT      = 1
  VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
  
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.2.0
+-    INSTALLBASE    = /usr/local/qwt-5.2.1
 -}
 -
 -win32 {
--    INSTALLBASE    = C:/Qwt-5.2.0
+-    INSTALLBASE    = C:/Qwt-5.2.1
 -}
 -
 -target.path    = $$INSTALLBASE/lib
@@ -34,7 +34,7 @@ diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
  
  ######################################################################
  # qmake internal options
-@@ -97,7 +89,7 @@
+@@ -98,7 +90,7 @@
  # QwtSVGItem.
  ######################################################################
  
@@ -42,4 +42,4 @@ diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
 +CONFIG     += QwtSVGItem
  
  ######################################################################
- # If you have a commercial license you can use the MathML renderer
+ # You can use the MathML renderer of the Qt solutions package to 
diff --git a/sources b/sources
index 88209d8..63aacbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c60b4cfac271a41524402b3ae5197890  qwt-5.2.0.tar.bz2
+4a595b8db0ec3856b117836c1d60cb27  qwt-5.2.1.tar.bz2