Merge commit '8353127ae60838fde1fc34fdc662647213ca44bd' into f23
This commit is contained in:
Rex Dieter
commit
87382e0fcd
10
.gitignore
vendored
10
.gitignore
vendored
@ -1,7 +1,5 @@
|
||||
/qtlocation-opensource-src-5.4.0.tar.xz
|
||||
/qtlocation-opensource-src-5.4.1.tar.xz
|
||||
/qtlocation-opensource-src-5.4.2.tar.xz
|
||||
/qtlocation-opensource-src-5.5.0-rc.tar.xz
|
||||
/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
|
||||
/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
|
||||
|
||||
@ -12,30 +12,25 @@
|
||||
%endif
|
||||
%endif
|
||||
|
||||
## define prerelease rc1
|
||||
#define prerelease
|
||||
|
||||
Summary: Qt5 - Location component
|
||||
Name: qt5-%{qt_module}
|
||||
Version: 5.5.1
|
||||
Release: 2%{?dist}
|
||||
Version: 5.6.0
|
||||
Release: 1%{?prerelease:.%{prerelease}}%{?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/snapshots/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.4.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-qtdeclarative-devel >= %{version}
|
||||
BuildRequires: pkgconfig(Qt5Qml) >= 5.4.0
|
||||
BuildRequires: pkgconfig(geoclue)
|
||||
%if 0%{?rhel} < 7
|
||||
# gyspy currently not available on epel7, https://bugzilla.redhat.com/1069225
|
||||
BuildRequires: pkgconfig(gypsy)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(Qt5Quick) >= %{version}
|
||||
|
||||
# QtPositioning core-private
|
||||
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
|
||||
@ -56,6 +51,7 @@ Requires: qt5-qtbase-devel%{?_isa}
|
||||
%package doc
|
||||
Summary: API documentation for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildRequires: qt5-qdoc
|
||||
BuildRequires: qt5-qhelpgenerator
|
||||
BuildArch: noarch
|
||||
%description doc
|
||||
@ -112,7 +108,7 @@ popd
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%doc LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL*
|
||||
%license LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL*
|
||||
%{_qt5_libdir}/libQt5Location.so.5*
|
||||
%{_qt5_archdatadir}/qml/QtLocation/
|
||||
%{_qt5_plugindir}/geoservices/
|
||||
@ -141,7 +137,7 @@ popd
|
||||
|
||||
%if 0%{?docs}
|
||||
%files doc
|
||||
%doc LICENSE.FDL
|
||||
%license LICENSE.FDL
|
||||
%{_qt5_docdir}/qtlocation.qch
|
||||
%{_qt5_docdir}/qtlocation/
|
||||
%{_qt5_docdir}/qtpositioning.qch
|
||||
@ -155,6 +151,41 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Mar 14 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-1
|
||||
- 5.6.0 final release
|
||||
|
||||
* Tue Feb 23 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.10.rc
|
||||
- Update to final RC
|
||||
|
||||
* Sun Feb 21 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.9.rc
|
||||
- rebuild
|
||||
|
||||
* Mon Feb 15 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.8
|
||||
- Update RC release
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-0.7.beta
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Mon Dec 28 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.6.beta
|
||||
- update source URL, use %%license, BR: cmake
|
||||
|
||||
* Mon Dec 21 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.5
|
||||
- Update to final beta release
|
||||
|
||||
* Fri Dec 11 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-0.4
|
||||
- (re) add bootstrap macro support
|
||||
- drop geoclue(1) dep (unused at build time anyway (#1286886)
|
||||
- drop (deprecated) gypsy support (#1069225)
|
||||
|
||||
* Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.3
|
||||
- Official beta release
|
||||
|
||||
* Sun Dec 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.2
|
||||
- (re)add bootstrap macro support
|
||||
|
||||
* Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1
|
||||
- Start to implement 5.6.0 beta
|
||||
|
||||
* Thu Oct 15 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-2
|
||||
- Update to final release 5.5.1
|
||||
|
||||
|
||||
@ -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
|
||||
{
|
||||
|
||||
13
qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch
Normal file
13
qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch
Normal file
@ -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
|
||||
Loading…
Reference in New Issue
Block a user