[mingw-qt5-qtlocation] Update to 5.2.0 RC1

Erik van Pienbroek epienbro at fedoraproject.org
Fri Nov 29 21:21:41 UTC 2013


commit 78e64091072406f05796701e9db71b681d49ab83
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Nov 29 22:21:33 2013 +0100

    Update to 5.2.0 RC1

 .gitignore                |    1 +
 mingw-qt5-qtlocation.spec |   72 ++++++++++++++++++++++++++++----------------
 sources                   |    2 +-
 3 files changed, 48 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f35a501..cc58aba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qt5-qtlocation-f2840834.tar.gz
+/qtlocation-opensource-src-5.2.0-rc1.tar.xz
diff --git a/mingw-qt5-qtlocation.spec b/mingw-qt5-qtlocation.spec
index f78d788..1e0ebf8 100644
--- a/mingw-qt5-qtlocation.spec
+++ b/mingw-qt5-qtlocation.spec
@@ -1,10 +1,10 @@
 %?mingw_package_header
 
 %global qt_module qtlocation
-#%%global pre beta1
+%global pre rc1
 
-%global snapshot_date 20130510
-%global snapshot_rev f2840834
+#%%global snapshot_date 20130510
+#%%global snapshot_rev f2840834
 
 %if 0%{?snapshot_date}
 %global source_folder qt-%{qt_module}
@@ -12,9 +12,12 @@
 %global source_folder %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
 %endif
 
+# first two digits of version
+%global release_version %(echo %{version} | awk -F. '{print $1"."$2}')
+
 Name:           mingw-qt5-%{qt_module}
-Version:        5.0.0
-Release:        0.6%{?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 - QtLocation component
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -26,7 +29,11 @@ URL:            http://www.qtsoftware.com/
 # 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://releases.qt-project.org/qt5/%{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
 
 BuildArch:      noarch
@@ -112,38 +119,51 @@ rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll
 
 # Win32
 %files -n mingw32-qt5-%{qt_module}
-%{mingw32_bindir}/Qt0Location.dll
+%{mingw32_bindir}/Qt5Location.dll
+%{mingw32_bindir}/Qt5Positioning.dll
 %{mingw32_includedir}/qt5/QtLocation/
-%{mingw32_libdir}/libQt0Location.dll.a
+%{mingw32_includedir}/qt5/QtPositioning/
+%{mingw32_libdir}/libQt5Location.dll.a
+%{mingw32_libdir}/libQt5Positioning.dll.a
 %{mingw32_libdir}/cmake/Qt5Location/
-%{mingw32_libdir}/pkgconfig/Qt0Location.pc
-%dir %{mingw32_libdir}/qt5/plugins/geoservices/
-%{mingw32_libdir}/qt5/plugins/geoservices/qtgeoservices_nokia.dll
-%{mingw32_libdir}/qt5/plugins/geoservices/qtgeoservices_osm.dll
-%dir %{mingw32_datadir}/qt5/qml/QtLocation/
-%{mingw32_datadir}/qt5/qml/QtLocation/declarative_location.dll
-%{mingw32_datadir}/qt5/qml/QtLocation/plugins.qmltypes
-%{mingw32_datadir}/qt5/qml/QtLocation/qmldir
+%{mingw32_libdir}/cmake/Qt5Positioning/
+%{mingw32_libdir}/pkgconfig/Qt5Location.pc
+%{mingw32_libdir}/pkgconfig/Qt5Positioning.pc
+%{mingw32_libdir}/qt5/plugins/geoservices/
+%{mingw32_libdir}/qt5/plugins/position/
+%{mingw32_datadir}/qt5/qml/QtLocation/
+%{mingw32_datadir}/qt5/qml/QtPositioning/
 %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_location.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_location_private.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_positioning.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_positioning_private.pri
 
 # Win64
 %files -n mingw64-qt5-%{qt_module}
-%{mingw64_bindir}/Qt0Location.dll
+%{mingw64_bindir}/Qt5Location.dll
+%{mingw64_bindir}/Qt5Positioning.dll
 %{mingw64_includedir}/qt5/QtLocation/
-%{mingw64_libdir}/libQt0Location.dll.a
+%{mingw64_includedir}/qt5/QtPositioning/
+%{mingw64_libdir}/libQt5Location.dll.a
+%{mingw64_libdir}/libQt5Positioning.dll.a
 %{mingw64_libdir}/cmake/Qt5Location/
-%{mingw64_libdir}/pkgconfig/Qt0Location.pc
-%dir %{mingw64_libdir}/qt5/plugins/geoservices/
-%{mingw64_libdir}/qt5/plugins/geoservices/qtgeoservices_nokia.dll
-%{mingw64_libdir}/qt5/plugins/geoservices/qtgeoservices_osm.dll
-%dir %{mingw64_datadir}/qt5/qml/QtLocation/
-%{mingw64_datadir}/qt5/qml/QtLocation/declarative_location.dll
-%{mingw64_datadir}/qt5/qml/QtLocation/plugins.qmltypes
-%{mingw64_datadir}/qt5/qml/QtLocation/qmldir
+%{mingw64_libdir}/cmake/Qt5Positioning/
+%{mingw64_libdir}/pkgconfig/Qt5Location.pc
+%{mingw64_libdir}/pkgconfig/Qt5Positioning.pc
+%{mingw64_libdir}/qt5/plugins/geoservices/
+%{mingw64_libdir}/qt5/plugins/position/
+%{mingw64_datadir}/qt5/qml/QtLocation/
+%{mingw64_datadir}/qt5/qml/QtPositioning/
 %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_location.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_location_private.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_positioning.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_positioning_private.pri
 
 
 %changelog
+* Fri Nov 29 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-0.1.rc1
+- Update to 5.2.0 RC1
+
 * Fri Aug  2 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.0.0-0.6.git20130510.f2840834
 - Dropped reference to unused patch
 - Don't bundle .dll.debug files in the main packages
diff --git a/sources b/sources
index b79efc0..473c2eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bef598a14cbff37021305dda6f0c550  qt5-qtlocation-f2840834.tar.gz
+d46d60b527ef366d912f4a67d9ad4c4e  qtlocation-opensource-src-5.2.0-rc1.tar.xz


More information about the scm-commits mailing list