[mingw-qt5-qttools] Update to 5.2.0

[Erik van Pienbroek]

commit 198f67d63b3d1d0298438c683e4a7fb334aff934
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Jan 5 20:24:07 2014 +0100

    Update to 5.2.0

 .gitignore             |    1 +
 mingw-qt5-qttools.spec |   32 ++++++++++++++++----------------
 sources                |    2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c680133..992141f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /qttools-opensource-src-5.1.0.tar.xz
 /qttools-opensource-src-5.1.1.tar.xz
 /qttools-opensource-src-5.2.0-rc1.tar.xz
+/qttools-opensource-src-5.2.0.tar.xz
diff --git a/mingw-qt5-qttools.spec b/mingw-qt5-qttools.spec
index 02ef7b4..8e7f64f 100644
--- a/mingw-qt5-qttools.spec
+++ b/mingw-qt5-qttools.spec
@@ -5,7 +5,7 @@
 %global __debug_install_post %%{mingw_debug_install_post}; %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%%{?buildsubdir}" %{nil}
 
 %global qt_module qttools
-%global pre rc1
+#%%global pre rc1
 
 #%%global snapshot_date 20121112
 #%%global snapshot_rev 769fa282
@@ -21,7 +21,7 @@
 
 Name:           mingw-qt5-%{qt_module}
 Version:        5.2.0
-Release:        0.1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Release:        1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
 Summary:        Qt5 for Windows - QtTools component
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -152,15 +152,12 @@ for fn in $RPM_BUILD_ROOT%{mingw32_bindir}/*.exe $RPM_BUILD_ROOT%{mingw64_bindir
     mv $fn $fn_new
 done
 
-# Move the lconvert, lupdate and lrelease tools to a more proper location and create symlinks
+# Create symlinks for the tools lconvert, lupdate and lrelease tools
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 
 for tool in lconvert lupdate lrelease; do
-    mv $RPM_BUILD_ROOT%{_prefix}/%{mingw32_target}/bin/$tool $RPM_BUILD_ROOT%{_prefix}/%{mingw32_target}/bin/$tool-qt5
-    ln -s ../%{mingw32_target}/bin/$tool-qt5 $RPM_BUILD_ROOT%{_bindir}/%{mingw32_target}-$tool-qt5
-
-    mv $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/bin/$tool $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/bin/$tool-qt5
-    ln -s ../%{mingw64_target}/bin/$tool-qt5 $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-$tool-qt5
+    ln -s ../%{mingw32_target}/bin/qt5/$tool $RPM_BUILD_ROOT%{_bindir}/%{mingw32_target}-$tool-qt5
+    ln -s ../%{mingw64_target}/bin/qt5/$tool $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-$tool-qt5
 done
 
 
@@ -214,12 +211,12 @@ done
 
 %files -n mingw32-qt5-%{qt_module}-tools
 %{_bindir}/%{mingw32_target}-lconvert-qt5
-%{_prefix}/%{mingw32_target}/bin/lconvert-qt5
 %{_bindir}/%{mingw32_target}-lupdate-qt5
-%{_prefix}/%{mingw32_target}/bin/lupdate-qt5
 %{_bindir}/%{mingw32_target}-lrelease-qt5
-%{_prefix}/%{mingw32_target}/bin/lrelease-qt5
-%{_prefix}/%{mingw32_target}/bin/windeployqt
+%{_prefix}/%{mingw32_target}/bin/qt5/lconvert
+%{_prefix}/%{mingw32_target}/bin/qt5/lupdate
+%{_prefix}/%{mingw32_target}/bin/qt5/lrelease
+%{_prefix}/%{mingw32_target}/bin/qt5/windeployqt
 
 # Win64
 %files -n mingw64-qt5-%{qt_module}
@@ -269,15 +266,18 @@ done
 
 %files -n mingw64-qt5-%{qt_module}-tools
 %{_bindir}/%{mingw64_target}-lconvert-qt5
-%{_prefix}/%{mingw64_target}/bin/lconvert-qt5
 %{_bindir}/%{mingw64_target}-lupdate-qt5
-%{_prefix}/%{mingw64_target}/bin/lupdate-qt5
 %{_bindir}/%{mingw64_target}-lrelease-qt5
-%{_prefix}/%{mingw64_target}/bin/lrelease-qt5
-%{_prefix}/%{mingw64_target}/bin/windeployqt
+%{_prefix}/%{mingw64_target}/bin/qt5/lconvert
+%{_prefix}/%{mingw64_target}/bin/qt5/lupdate
+%{_prefix}/%{mingw64_target}/bin/qt5/lrelease
+%{_prefix}/%{mingw64_target}/bin/qt5/windeployqt
 
 
 %changelog
+* Sun Jan  5 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-1
+- Update to 5.2.0
+
 * Fri Nov 29 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-0.1.rc1
 - Update to 5.2.0 RC1
 - Renamed the -lrelease subpackage to -tools
diff --git a/sources b/sources
index 9621a65..40931d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7ae71a84014f74db9b7194f8ce1c4de  qttools-opensource-src-5.2.0-rc1.tar.xz
+76a0992967b6d02220ecb69a5ba04ef1  qttools-opensource-src-5.2.0.tar.xz