From fd5461dad2f8b4f0def35811695d48e2244c64b7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Oct 19 2014 16:04:52 +0000 Subject: 5.4.0-beta --- diff --git a/.gitignore b/.gitignore index a2f1a15..d84a61a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtlocation-opensource-src-5.3.2.tar.xz +/qtlocation-opensource-src-5.4.0-beta.tar.xz diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec index 3b2d3ab..74ae473 100644 --- a/qt5-qtlocation.spec +++ b/qt5-qtlocation.spec @@ -3,41 +3,39 @@ # define to build docs, need to undef this for bootstrapping %define docs 1 +%define pre beta + Summary: Qt5 - Location component Name: qt5-%{qt_module} -Version: 5.3.2 -Release: 1%{?dist} +Version: 5.4.0 +Release: 0.1.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://qt-project.org/ %if 0%{?pre:1} -Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz +Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz %else -Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz %endif +## upstreamable patches +# try to support older glib2 (like el6) +Patch50: qtlocation-opensource-src-5.4.0-G_VALUE_INIT.patch + BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(geoclue) %if 0%{?rhel} < 7 # gyspy currently not available on epel7, https://bugzilla.redhat.com/1069225 BuildRequires: pkgconfig(gypsy) -%define g_value_init_hack 1 -# # try to support older glib2 (like el6) -Patch50: qtlocation-opensource-src-5.3.1-G_VALUE_INIT.patch -%else -# G_VALUE_INIT is new in 2.30 -BuildRequires: pkgconfig(glib-2.0) >= 2.30 %endif %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} %description -The Qt Positioning API gives developers the ability to determine a position -by using a variety of possible sources, including satellite, or wifi, or - text file, and so on. That information can then be used to for example -determine a position on a map. In addition satellite information can be -retrieved and area based monitoring can be performed. +The Qt Location and Qt Positioning APIs gives developers the ability to +determine a position by using a variety of possible sources, including +satellite, or wifi, or text file, and so on. %package devel Summary: Development files for %{name} @@ -67,9 +65,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}} -%if 0%{?g_value_init_hack} +## G_VALUE_INIT is new in glib-2.30+ only %patch50 -p1 -b .G_VALUE_INIT -%endif %build @@ -106,22 +103,38 @@ popd %postun -p /sbin/ldconfig %files -%doc LGPL_EXCEPTION.txt LICENSE.GPL LICENSE.LGPL +%doc LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL* +%{_qt5_libdir}/libQt5Location.so.5* +%{_qt5_archdatadir}/qml/QtLocation/ +%{_qt5_plugindir}/geoservices/ %{_qt5_libdir}/libQt5Positioning.so.5* -%{_qt5_plugindir}/position/ %{_qt5_archdatadir}/qml/QtPositioning/ +%{_qt5_plugindir}/position/ +%dir %{_qt5_libdir}/cmake/ +%dir %{_qt5_libdir}/cmake/Qt5Location +%dir %{_qt5_libdir}/cmake/Qt5Positioning +%{_qt5_libdir}/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactory*.cmake +%{_qt5_libdir}/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactory*.cmake %files devel +%{_qt5_headerdir}/QtLocation/ +%{_qt5_libdir}/libQt5Location.so +%{_qt5_libdir}/libQt5Location.prl +%{_qt5_libdir}/pkgconfig/Qt5Location.pc +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_location*.pri +%{_qt5_libdir}/cmake/Qt5Location/Qt5LocationConfig*.cmake %{_qt5_headerdir}/QtPositioning/ %{_qt5_libdir}/libQt5Positioning.so %{_qt5_libdir}/libQt5Positioning.prl -%{_qt5_libdir}/cmake/Qt5Positioning/ +%{_qt5_libdir}/cmake/Qt5Positioning/Qt5PositioningConfig*.cmake %{_qt5_libdir}/pkgconfig/Qt5Positioning.pc %{_qt5_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri %if 0%{?docs} %files doc %doc LICENSE.FDL +%{_qt5_docdir}/qtlocation.qch +%{_qt5_docdir}/qtlocation/ %{_qt5_docdir}/qtpositioning.qch %{_qt5_docdir}/qtpositioning/ %endif @@ -133,6 +146,9 @@ popd %changelog +* Sun Oct 19 2014 Rex Dieter 5.4.0-0.1.beta +- 5.4.0-beta + * Tue Sep 16 2014 Rex Dieter 5.3.2-1 - 5.3.2 diff --git a/qtlocation-opensource-src-5.3.1-G_VALUE_INIT.patch b/qtlocation-opensource-src-5.3.1-G_VALUE_INIT.patch deleted file mode 100644 index 10cddd8..0000000 --- a/qtlocation-opensource-src-5.3.1-G_VALUE_INIT.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up qtlocation-opensource-src-5.3.1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp.G_VALUE_INIT qtlocation-opensource-src-5.3.1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp ---- qtlocation-opensource-src-5.3.1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp.G_VALUE_INIT 2014-06-19 05:08:32.000000000 -0500 -+++ qtlocation-opensource-src-5.3.1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp 2014-07-24 09:48:59.800638065 -0500 -@@ -61,6 +61,10 @@ QT_BEGIN_NAMESPACE - #define MINIMUM_UPDATE_INTERVAL 1000 - #define UPDATE_TIMEOUT_COLD_START 120000 - -+#ifndef G_VALUE_INIT -+#define G_VALUE_INIT { 0 } -+#endif -+ - namespace - { - diff --git a/qtlocation-opensource-src-5.4.0-G_VALUE_INIT.patch b/qtlocation-opensource-src-5.4.0-G_VALUE_INIT.patch new file mode 100644 index 0000000..a6613d8 --- /dev/null +++ b/qtlocation-opensource-src-5.4.0-G_VALUE_INIT.patch @@ -0,0 +1,14 @@ +diff -up qtlocation-opensource-src-5.4.0-beta/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp.G_VALUE_INIT qtlocation-opensource-src-5.4.0-beta/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp +--- qtlocation-opensource-src-5.4.0-beta/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp.G_VALUE_INIT 2014-10-14 11:41:00.000000000 -0500 ++++ qtlocation-opensource-src-5.4.0-beta/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp 2014-10-19 10:55:13.424430439 -0500 +@@ -53,6 +53,10 @@ QT_BEGIN_NAMESPACE + #define MINIMUM_UPDATE_INTERVAL 1000 + #define UPDATE_TIMEOUT_COLD_START 120000 + ++#ifndef G_VALUE_INIT ++#define G_VALUE_INIT { 0 } ++#endif ++ + namespace + { + diff --git a/sources b/sources index abe40df..3918f8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ad3ee98f6f5d71df8dda14edc06346c qtlocation-opensource-src-5.3.2.tar.xz +47de3b1885253436ad2c40a478db7e46 qtlocation-opensource-src-5.4.0-beta.tar.xz