[mingw-qt5-qtdeclarative] Update to 5.2.0

Erik van Pienbroek epienbro at fedoraproject.org
Sun Jan 5 17:24:20 UTC 2014


commit aa82334099a2f52dad936f8271eaa2fdaceaafc6
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Jan 5 18:24:23 2014 +0100

    Update to 5.2.0

 .gitignore                   |    1 +
 mingw-qt5-qtdeclarative.spec |   17 +++++++++--------
 sources                      |    2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0eae8e4..a989e75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /qtdeclarative-opensource-src-5.1.0.tar.xz
 /qtdeclarative-opensource-src-5.1.1.tar.xz
 /qtdeclarative-opensource-src-5.2.0-rc1.tar.xz
+/qtdeclarative-opensource-src-5.2.0.tar.xz
diff --git a/mingw-qt5-qtdeclarative.spec b/mingw-qt5-qtdeclarative.spec
index 3334063..0e39f63 100644
--- a/mingw-qt5-qtdeclarative.spec
+++ b/mingw-qt5-qtdeclarative.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 qtdeclarative
-%global pre rc1
+#%%global pre rc1
 
 #%%global snapshot_date 20121111
 #%%global snapshot_rev dd1d6b56
@@ -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 - QtDeclarative component
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -189,7 +189,6 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
 %{mingw32_libdir}/cmake/Qt5Qml/
 %{mingw32_libdir}/cmake/Qt5Quick/
 %{mingw32_libdir}/cmake/Qt5QuickTest/
-%{mingw32_libdir}/cmake/Qt5Widgets/Qt5Widgets_AccessibleQuickFactory.cmake
 %{mingw32_libdir}/pkgconfig/Qt5Qml.pc
 %{mingw32_libdir}/pkgconfig/Qt5Quick.pc
 %{mingw32_libdir}/pkgconfig/Qt5QuickParticles.pc
@@ -219,8 +218,8 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
 %dir %{mingw32_datadir}/qt5/qml/Qt/labs/
 
 %files -n mingw32-qt5-qmldevtools
-%{_prefix}/%{mingw32_target}/bin/qmlimportscanner
-%{_prefix}/%{mingw32_target}/bin/qmlmin
+%{_prefix}/%{mingw32_target}/bin/qt5/qmlimportscanner
+%{_prefix}/%{mingw32_target}/bin/qt5/qmlmin
 %{_prefix}/%{mingw32_target}/lib/libQt5QmlDevTools.so
 
 %files -n mingw32-qt5-qmldevtools-devel
@@ -250,7 +249,6 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
 %{mingw64_libdir}/cmake/Qt5Qml/
 %{mingw64_libdir}/cmake/Qt5Quick/
 %{mingw64_libdir}/cmake/Qt5QuickTest/
-%{mingw64_libdir}/cmake/Qt5Widgets/Qt5Widgets_AccessibleQuickFactory.cmake
 %{mingw64_libdir}/pkgconfig/Qt5Qml.pc
 %{mingw64_libdir}/pkgconfig/Qt5Quick.pc
 %{mingw64_libdir}/pkgconfig/Qt5QuickParticles.pc
@@ -280,8 +278,8 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
 %dir %{mingw64_datadir}/qt5/qml/Qt/labs/
 
 %files -n mingw64-qt5-qmldevtools
-%{_prefix}/%{mingw64_target}/bin/qmlimportscanner
-%{_prefix}/%{mingw64_target}/bin/qmlmin
+%{_prefix}/%{mingw64_target}/bin/qt5/qmlimportscanner
+%{_prefix}/%{mingw64_target}/bin/qt5/qmlmin
 %{_prefix}/%{mingw64_target}/lib/libQt5QmlDevTools.so
 
 %files -n mingw64-qt5-qmldevtools-devel
@@ -289,6 +287,9 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
 
 
 %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
 
diff --git a/sources b/sources
index 7b3bee8..f2c0fd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79a9d5ac1bdf41bfd1491311e0b5a07c  qtdeclarative-opensource-src-5.2.0-rc1.tar.xz
+0f7714c5c91b8eb7cdc1071f0a51c202  qtdeclarative-opensource-src-5.2.0.tar.xz


More information about the scm-commits mailing list