From c886bad82f75545783f4ffaad60865cbae25a4de Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Dec 10 2015 20:39:31 +0000 Subject: - Update to final official beta --- diff --git a/.gitignore b/.gitignore index 9bbeb03..656db09 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /qtlocation-opensource-src-5.5.0.tar.xz /qtlocation-opensource-src-5.5.1-rc1.tar.xz /qtlocation-opensource-src-5.5.1.tar.xz +/qtlocation-opensource-src-5.6.0-beta.tar.gz diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec index 1f63f08..39ebca5 100644 --- a/qt5-qtlocation.spec +++ b/qt5-qtlocation.spec @@ -1,36 +1,27 @@ %global qt_module qtlocation -# define to build docs, need to undef this for bootstrapping -# where qt5-qttools builds are not yet available -# only primary archs (for now), allow secondary to bootstrap -#global bootstrap 1 - -%if ! 0%{?bootstrap} -%ifarch %{arm} %{ix86} x86_64 %define docs 1 -%endif -%endif -## define prerelease rc1 +%define prerelease beta Summary: Qt5 - Location component Name: qt5-%{qt_module} -Version: 5.5.1 -Release: 2%{?dist} +Version: 5.6.0 +Release: 0.2%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io -Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz +Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.gz ## upstreamable patches # try to support older glib2 (like el6) -Patch50: qtlocation-opensource-src-5.4.0-G_VALUE_INIT.patch +Patch50: qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qtdeclarative-devel >= %{version} -BuildRequires: pkgconfig(Qt5Qml) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Quick) >= %{version} +BuildRequires: qt5-qdoc BuildRequires: pkgconfig(geoclue) %if 0%{?rhel} < 7 # gyspy currently not available on epel7, https://bugzilla.redhat.com/1069225 @@ -155,6 +146,12 @@ popd %changelog +* Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.2 +- Official beta release + +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + * Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 - Update to final release 5.5.1 diff --git a/qtlocation-opensource-src-5.4.0-G_VALUE_INIT.patch b/qtlocation-opensource-src-5.4.0-G_VALUE_INIT.patch deleted file mode 100644 index a6613d8..0000000 --- a/qtlocation-opensource-src-5.4.0-G_VALUE_INIT.patch +++ /dev/null @@ -1,14 +0,0 @@ -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/qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch b/qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch new file mode 100644 index 0000000..4ed7bec --- /dev/null +++ b/qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch @@ -0,0 +1,13 @@ +--- qtlocation-opensource-src-5.6.0-beta1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp 2015-11-03 12:20:38.000000000 -0200 ++++ qtlocation-opensource-src-5.6.0-beta1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp.new 2015-11-10 16:04:55.661725365 -0200 +@@ -57,6 +57,10 @@ + #define MINIMUM_UPDATE_INTERVAL 1000 + #define UPDATE_TIMEOUT_COLD_START 120000 + ++#ifndef G_VALUE_INIT ++#define G_VALUE_INIT { 0 } ++#endif ++ + QT_BEGIN_NAMESPACE + + namespace diff --git a/sources b/sources index d3d1425..58f1bec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e0c0ad76f520ba89da730b8ff601cc2 qtlocation-opensource-src-5.5.1.tar.xz +21e6c6b85007ede3ff100954d67ed215 qtlocation-opensource-src-5.6.0-beta.tar.gz