From 18443204868abcc71736a6cf0e946c43de5d5e83 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:31:45 +0000 Subject: import qt5-qtlocation-5.6.2-1.el7 --- diff --git a/.gitignore b/.gitignore index 5238df2..af60077 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtlocation-opensource-src-5.6.1.tar.xz +SOURCES/qtlocation-opensource-src-5.6.2.tar.xz diff --git a/.qt5-qtlocation.metadata b/.qt5-qtlocation.metadata index f846934..77a463f 100644 --- a/.qt5-qtlocation.metadata +++ b/.qt5-qtlocation.metadata @@ -1 +1 @@ -2f5a5cab0b0133a2ad84c4ae218e7c2c832f4411 SOURCES/qtlocation-opensource-src-5.6.1.tar.xz +c10875434bdbe93ba854c8411824b192fd7df8aa SOURCES/qtlocation-opensource-src-5.6.2.tar.xz diff --git a/SPECS/qt5-qtlocation.spec b/SPECS/qt5-qtlocation.spec index 8ddbae3..8842d04 100644 --- a/SPECS/qt5-qtlocation.spec +++ b/SPECS/qt5-qtlocation.spec @@ -12,17 +12,15 @@ %endif %endif -#define prerelease - Summary: Qt5 - Location component Name: qt5-%{qt_module} -Version: 5.6.1 -Release: 10%{?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}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz ## upstreamable patches # try to support older glib2 (like el6) @@ -30,7 +28,7 @@ Patch50: qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch BuildRequires: cmake BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: pkgconfig(Qt5Quick) >= %{version} +BuildRequires: qt5-qtdeclarative-devel >= %{version} # QtPositioning core-private BuildRequires: qt5-qtbase-private-devel @@ -67,7 +65,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep -%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} +%setup -q -n %{qt_module}-opensource-src-%{version} ## G_VALUE_INIT is new in glib-2.30+ only %patch50 -p1 -b .G_VALUE_INIT @@ -152,6 +150,10 @@ popd %changelog +* Wed Jan 11 2017 Jan Grulich - 5.6.2-1 +- Update to 5.6.2 + Resolves: bz#1384822 + * Tue Aug 30 2016 Jan Grulich - 5.6.1-10 - Increase build version to have newer version than in EPEL Resolves: bz#1317405