[mingw-qwt] update to 5.2.2

[sailer]

commit d7952754730bbee1ef7e78ec1a5889cc073e01ca
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Tue Aug 21 18:05:31 2012 +0200

    update to 5.2.2

 .gitignore     |    1 +
 mingw-qwt.spec |   94 ++++++++++++++++++++++++++++++++++++++------------------
 sources        |    2 +-
 3 files changed, 66 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5993ab5..f4af095 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 qwt-5.1.1.tar.bz2
 qwt-5.2.0.tar.bz2
 qwt-5.2.1.tar.bz2
+/qwt-5.2.2.tar.bz2
diff --git a/mingw-qwt.spec b/mingw-qwt.spec
index ccbe906..2354135 100644
--- a/mingw-qwt.spec
+++ b/mingw-qwt.spec
@@ -1,23 +1,22 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%?mingw_package_header
 
 %global name1 qwt
 %global name2 %{name1}5
 
 Name:           mingw-%{name1}
 Summary:        MinGW Windows Qwt library
-Version:        5.2.1
-Release:        8%{?dist}
+Version:        5.2.2
+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-path.patch
-Patch1:         qwt-qhash.patch
-BuildRequires:  mingw32-filesystem >= 52
+BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw64-filesystem
 BuildRequires:  mingw32-qt
+BuildRequires:  mingw64-qt
 BuildRequires:  mingw32-gcc-c++
+BuildRequires:  mingw64-gcc-c++
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,19 +30,19 @@ Summary:        MinGW Windows Qwt library
 %description -n mingw32-%{name1}
 MinGW Windows Qwt library.
 
+%package -n mingw64-%{name1}
+Summary:        MinGW Windows Qwt library
+
+%description -n mingw64-%{name1}
+MinGW Windows Qwt library.
+
 
-%{?mingw32_debug_package}
+%{?mingw_debug_package}
 
 
 %prep
-%setup -qn %{name1}-%{version}
-%patch0 -p1
-#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
-#sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_qt4_plugindir}/designer\1" designer/designer.pro
-sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{mingw32_libdir}/qt4/plugins/designer\1" designer/designer.pro
+%setup -qcn %{name1}-%{version}
+pushd %{name1}-%{version}
 #disable Designer
 sed -i "s\CONFIG *+= *QwtDesigner\#CONFIG += QwtDesigner\1" qwtconfig.pri
 #disable Examples
@@ -51,38 +50,73 @@ sed -i "s\CONFIG *+= *QwtExamples\#CONFIG += QwtExamples\1" qwtconfig.pri
 #enable debug and release
 sed -i "s\ *CONFIG *+= *release\#CONFIG += release\1" qwtconfig.pri
 sed -i "s\ *#CONFIG *+= *debug_and_release\CONFIG += debug_and_release\1" qwtconfig.pri
-
+popd
+mv %{name1}-%{version} win32
+cp -r win32 win64
+pushd win32
+sed -i "s\ *INSTALLBASE *=.*\INSTALLBASE = $RPM_BUILD_ROOT%{mingw32_prefix}\1" qwtconfig.pri
+popd
+pushd win64
+sed -i "s\ *INSTALLBASE *=.*\INSTALLBASE = $RPM_BUILD_ROOT%{mingw64_prefix}\1" qwtconfig.pri
+popd
 
 %build
+pushd win32
 %mingw32_qmake_qt4
-#parallel build fails sometime so I disable it
-make
-pushd src
-perl -i -pe 's,4d,d4,g' Makefile.Debug
-make debug
+make release debug %{?_smp_mflags}
+popd
+pushd win64
+%mingw64_qmake_qt4
+make release debug %{?_smp_mflags}
 popd
 
 %install
+pushd win32
+make install
+popd
+pushd win64
 make install
+popd
 #remove unneeded stuff
-rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}/%{name1}
+rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/doc
+rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/doc
+%{__install} -d $RPM_BUILD_ROOT%{mingw32_includedir}/%{name1}
+%{__install} -d $RPM_BUILD_ROOT%{mingw64_includedir}/%{name1}
+%{__mv} $RPM_BUILD_ROOT%{mingw32_includedir}/*.h $RPM_BUILD_ROOT%{mingw32_includedir}/%{name1}
+%{__mv} $RPM_BUILD_ROOT%{mingw64_includedir}/*.h $RPM_BUILD_ROOT%{mingw64_includedir}/%{name1}
 %{__install} -d $RPM_BUILD_ROOT%{mingw32_bindir}
+%{__install} -d $RPM_BUILD_ROOT%{mingw64_bindir}
 %{__mv} $RPM_BUILD_ROOT%{mingw32_libdir}/%{name2}.dll $RPM_BUILD_ROOT%{mingw32_bindir}/
-%{__cp} lib/%{name1}d5.dll $RPM_BUILD_ROOT%{mingw32_bindir}/
-%{__cp} lib/lib%{name1}d5.a $RPM_BUILD_ROOT%{mingw32_libdir}/
-
+%{__mv} $RPM_BUILD_ROOT%{mingw64_libdir}/%{name2}.dll $RPM_BUILD_ROOT%{mingw64_bindir}/
+%{__cp} win32/lib/%{name1}d5.dll $RPM_BUILD_ROOT%{mingw32_bindir}/
+%{__cp} win64/lib/%{name1}d5.dll $RPM_BUILD_ROOT%{mingw64_bindir}/
+%{__cp} win32/lib/lib%{name1}d5.a $RPM_BUILD_ROOT%{mingw32_libdir}/
+%{__cp} win64/lib/lib%{name1}d5.a $RPM_BUILD_ROOT%{mingw64_libdir}/
 
 %files -n mingw32-%{name1}
-%doc CHANGES
-%doc COPYING
-%doc README
+%doc win32/CHANGES
+%doc win32/COPYING
+%doc win32/README
 %{mingw32_bindir}/%{name2}.dll
 %{mingw32_bindir}/%{name1}d5.dll
 %{mingw32_includedir}/%{name1}
 %{mingw32_libdir}/lib%{name2}.a
 %{mingw32_libdir}/lib%{name1}d5.a
 
+%files -n mingw64-%{name1}
+%doc win64/CHANGES
+%doc win64/COPYING
+%doc win64/README
+%{mingw64_bindir}/%{name2}.dll
+%{mingw64_bindir}/%{name1}d5.dll
+%{mingw64_includedir}/%{name1}
+%{mingw64_libdir}/lib%{name2}.a
+%{mingw64_libdir}/lib%{name1}d5.a
+
 %changelog
+* Tue Aug 21 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.2.2-1
+- update to 5.2.2
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 63aacbd..ee8e891 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a595b8db0ec3856b117836c1d60cb27  qwt-5.2.1.tar.bz2
+70d77e4008a6cc86763737f0f24726ca  qwt-5.2.2.tar.bz2