Merge branch 'f24' into f23

This commit is contained in:
Jan Grulich 2016-06-29 15:44:33 +02:00
commit cb4af22129
3 changed files with 15 additions and 4 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/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

View File

@ -16,8 +16,8 @@
Summary: Qt5 - Location component
Name: qt5-%{qt_module}
Version: 5.6.0
Release: 3%{?prerelease:.%{prerelease}}%{?dist}
Version: 5.6.1
Release: 2%{?prerelease:.%{prerelease}}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -30,9 +30,10 @@ 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
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
%description
@ -151,6 +152,15 @@ popd
%changelog
* Wed Jun 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-2
- drop pkgconfig-style Qt5 deps
* Thu Jun 09 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1
- Update to 5.6.1
* Thu Apr 21 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-4
- BR: qt5-qtbase-private-devel
* Sun Mar 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-3
- rebuild

View File

@ -1 +1 @@
a80ea35d92f851edad140b59749bd241 qtlocation-opensource-src-5.6.0.tar.xz
e985bfe7bd544bc7bb44221440f6eaa3 qtlocation-opensource-src-5.6.1.tar.xz