Merge branch 'f24' into f23

5.6.2
2016-11-21 13:52:22 -06:00 · 2016-11-16 21:13:24 -06:00 · 2016-06-29 15:44:33 +02:00 · 2016-03-20 17:23:24 -05:00 · 2016-03-18 17:27:48 -05:00 · 2016-03-18 17:27:36 -05:00
3 changed files with 8 additions and 13 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1 @@
-/qtlocation-opensource-src-5.5.1.tar.xz
-/qtlocation-opensource-src-5.6.0-beta.tar.gz
-/qtlocation-opensource-src-5.6.0-beta1.tar.xz
-/qtlocation-opensource-src-5.6.0-rc.tar.xz
-/qtlocation-opensource-src-5.6.0.tar.xz
-/qtlocation-opensource-src-5.6.1.tar.xz
+/qtlocation-opensource-src-5.6.2.tar.xz
--- a/qt5-qtlocation.spec
+++ b/qt5-qtlocation.spec
@ -12,23 +12,20 @@
 %endif
 %endif

-#define prerelease
-
 Summary: Qt5 - Location component
 Name:    qt5-%{qt_module}
-Version: 5.6.1
-Release: 2%{?prerelease:.%{prerelease}}%{?dist}
+Version: 5.6.2
+Release: 1%{?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/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
+Source0: http://download.qt.io/official_releases/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz

 ## upstreamable patches
 # try to support older glib2 (like el6)
 Patch50: qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch

-BuildRequires: cmake
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtdeclarative-devel >= %{version}

@ -152,6 +149,9 @@ popd


 %changelog
+* Wed Nov 16 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.2-1
+- 5.6.2
+
 * Wed Jun 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-2
 - drop pkgconfig-style Qt5 deps

--- a/2
+++ b/2
@ -1 +1 @@
-e985bfe7bd544bc7bb44221440f6eaa3  qtlocation-opensource-src-5.6.1.tar.xz
+5a704b653c5e5df4a5507311977993cd  qtlocation-opensource-src-5.6.2.tar.xz
Author	SHA1	Message	Date
Rex Dieter	cd20aa5ce7	Merge branch 'f24' into f23	2016-11-21 13:52:22 -06:00
Rex Dieter	9457bc5e65	5.6.2	2016-11-16 21:13:24 -06:00
Jan Grulich	cb4af22129	Merge branch 'f24' into f23	2016-06-29 15:44:33 +02:00
Rex Dieter	1c23f69b55	Merge branch 'master' into f23	2016-03-20 17:23:24 -05:00
Rex Dieter	87382e0fcd	Merge commit '8353127ae60838fde1fc34fdc662647213ca44bd' into f23	2016-03-18 17:27:48 -05:00
Rex Dieter	9e1253b525	Revert "5.5.1-3" This reverts commit `1be1f999e8`.	2016-03-18 17:27:36 -05:00
Rex Dieter	1be1f999e8	5.5.1-3 - 5.5 branches only (revert this when merging for 5.6) - drop geoclue(1) dep (unused at build time anyway (#1286886) - drop (deprecated) gypsy support (#1069225)	2015-12-11 12:39:02 -06:00