[mingw-qt5-qtwinextras] Update to 5.4.0

[Erik van Pienbroek]

commit 1e5560be442ca5c0bab5e4ad1d4cad03b2b63acf
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Jan 1 20:45:27 2015 +0100

    Update to 5.4.0

 .gitignore                                         |    1 +
 ...ndency-on-swprintf_s-pulled-in-via-_com_e.patch |   59 --------------------
 mingw-qt5-qtwinextras.spec                         |   26 +++-----
 sources                                            |    2 +-
 4 files changed, 12 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 379323e..c5ca339 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qtwinextras-opensource-src-5.3.0.tar.xz
+/qtwinextras-opensource-src-5.4.0.tar.xz
diff --git a/mingw-qt5-qtwinextras.spec b/mingw-qt5-qtwinextras.spec
index 088be46..38d0a37 100644
--- a/mingw-qt5-qtwinextras.spec
+++ b/mingw-qt5-qtwinextras.spec
@@ -16,7 +16,7 @@
 %global release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           mingw-qt5-%{qt_module}
-Version:        5.3.0
+Version:        5.4.0
 Release:        1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
 Summary:        Qt5 for Windows - QtWinExtras component
 
@@ -40,16 +40,13 @@ BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 96
 BuildRequires:  mingw32-gcc-c++
-BuildRequires:  mingw32-qt5-qtbase
-BuildRequires:  mingw32-qt5-qtdeclarative
+BuildRequires:  mingw32-qt5-qtbase >= 5.4.0
+BuildRequires:  mingw32-qt5-qtdeclarative >= 5.4.0
 
 BuildRequires:  mingw64-filesystem >= 96
 BuildRequires:  mingw64-gcc-c++
-BuildRequires:  mingw64-qt5-qtbase
-BuildRequires:  mingw64-qt5-qtdeclarative
-
-# Fix Windows XP compatibility issue (QTBUG-35617)
-Patch0:         0001-Remove-dependency-on-swprintf_s-pulled-in-via-_com_e.patch
+BuildRequires:  mingw64-qt5-qtbase >= 5.4.0
+BuildRequires:  mingw64-qt5-qtdeclarative >= 5.4.0
 
 
 %description
@@ -89,7 +86,6 @@ Fedora Windows cross-compiler.
 
 %prep
 %setup -q -n %{source_folder}
-%patch0 -p1
 
 
 %build
@@ -103,11 +99,6 @@ Fedora Windows cross-compiler.
 # .prl files aren't interesting for us
 find $RPM_BUILD_ROOT -name "*.prl" -delete
 
-# The .dll's are installed in both %%{mingw32_bindir} and %%{mingw32_libdir}
-# One copy of the .dll's is sufficient
-rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.dll
-rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll
-
 # Create a list of .dll.debug files which need to be excluded from the main packages
 # We do this to keep the %%files section as clean/readable as possible (otherwise every
 # single file and directory would have to be mentioned individually in the %%files section)
@@ -120,7 +111,7 @@ find $RPM_BUILD_ROOT%{mingw64_prefix} | grep .dll | grep -v .dll.a | sed s@"^$RP
 
 # Win32
 %files -n mingw32-qt5-%{qt_module} -f mingw32-qt5-%{qt_module}.excludes
-%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPLv2 LICENSE.LGPLv21 LICENSE.LGPLv3
 %{mingw32_bindir}/Qt5WinExtras.dll
 %{mingw32_includedir}/qt5/QtWinExtras/
 %{mingw32_libdir}/cmake/Qt5WinExtras/
@@ -132,7 +123,7 @@ find $RPM_BUILD_ROOT%{mingw64_prefix} | grep .dll | grep -v .dll.a | sed s@"^$RP
 
 # Win64
 %files -n mingw64-qt5-%{qt_module} -f mingw64-qt5-%{qt_module}.excludes
-%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPLv2 LICENSE.LGPLv21 LICENSE.LGPLv3
 %{mingw64_bindir}/Qt5WinExtras.dll
 %{mingw64_includedir}/qt5/QtWinExtras/
 %{mingw64_libdir}/cmake/Qt5WinExtras/
@@ -144,6 +135,9 @@ find $RPM_BUILD_ROOT%{mingw64_prefix} | grep .dll | grep -v .dll.a | sed s@"^$RP
 
 
 %changelog
+* Thu Jan  1 2015 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4.0-1
+- Update to 5.4.0
+
 * Sun May 25 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.3.0-1
 - Update to 5.3.0
 - Make sure the .dll.a files are included in the main packages
diff --git a/sources b/sources
index f7d4aa3..82a3b6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81994fc1f8634115db7bc1d09790b093  qtwinextras-opensource-src-5.3.0.tar.xz
+f3b86ad4b8c01483eda159c7b2405f08  qtwinextras-opensource-src-5.4.0.tar.xz