Merge branch 'f24' into f23
This commit is contained in:
commit
cd20aa5ce7
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,6 +1 @@
|
|||||||
/qtlocation-opensource-src-5.5.1.tar.xz
|
/qtlocation-opensource-src-5.6.2.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
|
|
||||||
|
@ -12,23 +12,20 @@
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
#define prerelease
|
|
||||||
|
|
||||||
Summary: Qt5 - Location component
|
Summary: Qt5 - Location component
|
||||||
Name: qt5-%{qt_module}
|
Name: qt5-%{qt_module}
|
||||||
Version: 5.6.1
|
Version: 5.6.2
|
||||||
Release: 2%{?prerelease:.%{prerelease}}%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
Url: http://www.qt.io
|
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
|
## upstreamable patches
|
||||||
# try to support older glib2 (like el6)
|
# try to support older glib2 (like el6)
|
||||||
Patch50: qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch
|
Patch50: qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch
|
||||||
|
|
||||||
BuildRequires: cmake
|
|
||||||
BuildRequires: qt5-qtbase-devel >= %{version}
|
BuildRequires: qt5-qtbase-devel >= %{version}
|
||||||
BuildRequires: qt5-qtdeclarative-devel >= %{version}
|
BuildRequires: qt5-qtdeclarative-devel >= %{version}
|
||||||
|
|
||||||
@ -152,6 +149,9 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Jun 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-2
|
||||||
- drop pkgconfig-style Qt5 deps
|
- drop pkgconfig-style Qt5 deps
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user