[mingw-qt5-qtdeclarative] Update to 5.2.0 RC1

Erik van Pienbroek epienbro at fedoraproject.org
Fri Nov 29 16:56:38 UTC 2013


commit 54819ccaaa82cc3b50dcf3b892f2db1bd529c59b
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Nov 29 17:56:29 2013 +0100

    Update to 5.2.0 RC1

 .gitignore                   |    1 +
 mingw-qt5-qtdeclarative.spec |   37 +++++++++++++++++++++++++++++--------
 sources                      |    2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c81ef8..0eae8e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /qtdeclarative-opensource-src-5.0.2.tar.xz
 /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
diff --git a/mingw-qt5-qtdeclarative.spec b/mingw-qt5-qtdeclarative.spec
index 13da8ad..372ba4f 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
@@ -20,8 +20,8 @@
 %global release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           mingw-qt5-%{qt_module}
-Version:        5.1.1
-Release:        1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Version:        5.2.0
+Release:        0.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
@@ -33,7 +33,11 @@ URL:            http://qt-project.org/
 # wget http://qt.gitorious.org/qt/%{qt_module}/archive-tarball/%{snapshot_rev} -O qt5-%{qt_module}-%{snapshot_rev}.tar.gz
 Source0:        qt5-%{qt_module}-%{snapshot_rev}.tar.gz
 %else
-Source0:        http://download.qt-project.org/official_releases/qt/%{release_version}/%{version}/submodules/%{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}.tar.xz
+%if "%{?pre}" != ""
+Source0:        http://download.qt-project.org/development_releases/qt/%{release_version}/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
+%else
+Source0:        http://download.qt-project.org/official_releases/qt/%{release_version}/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
+%endif
 %endif
 
 # Make sure the QmlDevTools library is built as
@@ -166,6 +170,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
 %{mingw32_bindir}/Qt5Quick.dll
 %{mingw32_bindir}/Qt5QuickParticles.dll
 %{mingw32_bindir}/Qt5QuickTest.dll
+%{mingw32_bindir}/qml.exe
 %{mingw32_bindir}/qmlbundle.exe
 %{mingw32_bindir}/qmlplugindump-qt5.exe
 %{mingw32_bindir}/qmlprofiler.exe
@@ -182,6 +187,7 @@ 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
@@ -190,15 +196,19 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
 %{mingw32_libdir}/qt5/plugins/qmltooling/qmldbg_qtquick2.dll
 %{mingw32_libdir}/qt5/plugins/qmltooling/qmldbg_tcp.dll
 %{mingw32_datadir}/qt5/qml/Qt/labs/folderlistmodel/
+%{mingw32_datadir}/qt5/qml/Qt/labs/settings/
 %{mingw32_datadir}/qt5/qml/QtQml/Models.2/
 %{mingw32_datadir}/qt5/qml/QtQuick.2/
 %{mingw32_datadir}/qt5/qml/QtQuick/
 %{mingw32_datadir}/qt5/qml/QtTest/
 %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_qml.pri
-%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_qmldevtools.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_qml_private.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri
 %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_qmltest.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_qmltest_private.pri
 %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_quick.pri
-%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_quickparticles.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_quick_private.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri
 
 # These folders are not used by qtdeclarative itself, but
 # by other Qt5 components which depend on qtdeclarative
@@ -207,6 +217,7 @@ 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}/lib/libQt5QmlDevTools.so
 
@@ -220,6 +231,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
 %{mingw64_bindir}/Qt5Quick.dll
 %{mingw64_bindir}/Qt5QuickParticles.dll
 %{mingw64_bindir}/Qt5QuickTest.dll
+%{mingw64_bindir}/qml.exe
 %{mingw64_bindir}/qmlbundle.exe
 %{mingw64_bindir}/qmlplugindump-qt5.exe
 %{mingw64_bindir}/qmlprofiler.exe
@@ -236,6 +248,7 @@ 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
@@ -244,15 +257,19 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
 %{mingw64_libdir}/qt5/plugins/qmltooling/qmldbg_qtquick2.dll
 %{mingw64_libdir}/qt5/plugins/qmltooling/qmldbg_tcp.dll
 %{mingw64_datadir}/qt5/qml/Qt/labs/folderlistmodel/
+%{mingw64_datadir}/qt5/qml/Qt/labs/settings/
 %{mingw64_datadir}/qt5/qml/QtQml/Models.2/
 %{mingw64_datadir}/qt5/qml/QtQuick.2/
 %{mingw64_datadir}/qt5/qml/QtQuick/
 %{mingw64_datadir}/qt5/qml/QtTest/
 %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_qml.pri
-%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_qmldevtools.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_qml_private.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri
 %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_qmltest.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_qmltest_private.pri
 %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_quick.pri
-%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_quickparticles.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_quick_private.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri
 
 # These folders are not used by qtdeclarative itself, but
 # by other Qt5 components which depend on qtdeclarative
@@ -261,6 +278,7 @@ 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}/lib/libQt5QmlDevTools.so
 
@@ -269,6 +287,9 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
 
 
 %changelog
+* Fri Nov 29 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-0.1.rc1
+- Update to 5.2.0 RC1
+
 * Sat Sep  7 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.1.1-1
 - Update to 5.1.1
 
diff --git a/sources b/sources
index cbf31ae..7b3bee8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-486fc16ad7b7d0c1488ba5482536d66c  qtdeclarative-opensource-src-5.1.1.tar.xz
+79a9d5ac1bdf41bfd1491311e0b5a07c  qtdeclarative-opensource-src-5.2.0-rc1.tar.xz


More information about the scm-commits mailing list