From 7ed56dc172c5ccb7c6460f61e76394bedffa99cb Mon Sep 17 00:00:00 2001 From: Till Maas Date: Aug 11 2017 19:53:45 +0000 Subject: 2017-08-11: package is now included in RHEL --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1aa3757..0000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/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 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..1e5c7f4 --- /dev/null +++ b/dead.package @@ -0,0 +1,2 @@ +2017-08-11: package is now included in RHEL + diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec deleted file mode 100644 index fa35838..0000000 --- a/qt5-qtlocation.spec +++ /dev/null @@ -1,284 +0,0 @@ - -%global qt_module qtlocation - -# define to build docs, need to undef this for bootstrapping -# where qt5-qttools builds are not yet available -# only primary archs (for now), allow secondary to bootstrap -#global bootstrap 1 - -%if ! 0%{?bootstrap} -%ifarch %{arm} %{ix86} x86_64 -%define docs 1 -%endif -%endif - -#define prerelease - -Summary: Qt5 - Location component -Name: qt5-%{qt_module} -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 -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 - -## 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} - -# QtPositioning core-private -BuildRequires: qt5-qtbase-private-devel -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} - -%description -The Qt Location and Qt Positioning APIs gives developers the ability to -determine a position by using a variety of possible sources, including -satellite, or wifi, or text file, and so on. - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt5-qtbase-devel%{?_isa} -%description devel -%{summary}. - -%if 0%{?docs} -%package doc -Summary: API documentation for %{name} -Requires: %{name} = %{version}-%{release} -BuildRequires: qt5-qdoc -BuildRequires: qt5-qhelpgenerator -BuildArch: noarch -%description doc -%{summary}. -%endif - -%package examples -Summary: Programming examples for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -%description examples -%{summary}. - - -%prep -%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} -## G_VALUE_INIT is new in glib-2.30+ only -%patch50 -p1 -b .G_VALUE_INIT - - -%build -mkdir %{_target_platform} -pushd %{_target_platform} -%{qmake_qt5} .. - -make %{?_smp_mflags} - -%if 0%{?docs} -make %{?_smp_mflags} docs -%endif -popd - - -%install -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} - -%if 0%{?docs} -make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} -%endif - -## .prl/.la file love -# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs -pushd %{buildroot}%{_qt5_libdir} -for prl_file in libQt5*.prl ; do - sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} - if [ -f "$(basename ${prl_file} .prl).so" ]; then - rm -fv "$(basename ${prl_file} .prl).la" - sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} - fi -done -popd - - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files -%license LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL* -%{_qt5_libdir}/libQt5Location.so.5* -%{_qt5_archdatadir}/qml/QtLocation/ -%{_qt5_plugindir}/geoservices/ -%{_qt5_libdir}/libQt5Positioning.so.5* -%{_qt5_archdatadir}/qml/QtPositioning/ -%{_qt5_plugindir}/position/ -%dir %{_qt5_libdir}/cmake/ -%dir %{_qt5_libdir}/cmake/Qt5Location -%dir %{_qt5_libdir}/cmake/Qt5Positioning -%{_qt5_libdir}/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactory*.cmake -%{_qt5_libdir}/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactory*.cmake - -%files devel -%{_qt5_headerdir}/QtLocation/ -%{_qt5_libdir}/libQt5Location.so -%{_qt5_libdir}/libQt5Location.prl -%{_qt5_libdir}/pkgconfig/Qt5Location.pc -%{_qt5_archdatadir}/mkspecs/modules/qt_lib_location*.pri -%{_qt5_libdir}/cmake/Qt5Location/Qt5LocationConfig*.cmake -%{_qt5_headerdir}/QtPositioning/ -%{_qt5_libdir}/libQt5Positioning.so -%{_qt5_libdir}/libQt5Positioning.prl -%{_qt5_libdir}/cmake/Qt5Positioning/Qt5PositioningConfig*.cmake -%{_qt5_libdir}/pkgconfig/Qt5Positioning.pc -%{_qt5_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri - -%if 0%{?docs} -%files doc -%license LICENSE.FDL -%{_qt5_docdir}/qtlocation.qch -%{_qt5_docdir}/qtlocation/ -%{_qt5_docdir}/qtpositioning.qch -%{_qt5_docdir}/qtpositioning/ -%endif - -%if 0%{?_qt5_examplesdir:1} -%files examples -%{_qt5_examplesdir}/ -%endif - - -%changelog -* Wed Jun 15 2016 Rex Dieter - 5.6.1-2 -- drop pkgconfig-style Qt5 deps - -* Thu Jun 09 2016 Jan Grulich - 5.6.1-1 -- Update to 5.6.1 - -* Thu Apr 21 2016 Rex Dieter - 5.6.0-4 -- BR: qt5-qtbase-private-devel - -* Sun Mar 20 2016 Rex Dieter - 5.6.0-3 -- rebuild - -* Fri Mar 18 2016 Rex Dieter - 5.6.0-2 -- rebuild - -* Mon Mar 14 2016 Helio Chissini de Castro - 5.6.0-1 -- 5.6.0 final release - -* Tue Feb 23 2016 Helio Chissini de Castro - 5.6.0-0.10.rc -- Update to final RC - -* Sun Feb 21 2016 Rex Dieter 5.6.0-0.9.rc -- rebuild - -* Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.8 -- Update RC release - -* Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.7.beta -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Dec 28 2015 Rex Dieter 5.6.0-0.6.beta -- update source URL, use %%license, BR: cmake - -* Mon Dec 21 2015 Helio Chissini de Castro - 5.6.0-0.5 -- Update to final beta release - -* Fri Dec 11 2015 Rex Dieter - 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 - 5.6.0-0.3 -- Official beta release - -* Sun Dec 06 2015 Rex Dieter 5.6.0-0.2 -- (re)add bootstrap macro support - -* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 -- Start to implement 5.6.0 beta - -* Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 -- Update to final release 5.5.1 - -* Tue Sep 29 2015 Helio Chissini de Castro - 5.5.1-1 -- Update to Qt 5.5.1 RC1 - -* Wed Jul 29 2015 Rex Dieter 5.5.0-3 -- -docs: BuildRequires: qt5-qhelpgenerator, standardize bootstrapping - -* Thu Jul 16 2015 Rex Dieter 5.5.0-2 -- tighten qtbase dep (#1233829), .spec cosmetics, (re)enable docs - -* Wed Jul 1 2015 Helio Chissini de Castro 5.5.0-1 -- New final upstream release Qt 5.5.0 - -* Wed Jun 24 2015 Helio Chissini de Castro - 5.5.0-0.2.rc -- Update for official RC1 released packages - -* Mon Jun 15 2015 Daniel Vrátil - 5.5.0-0.1.rc -- Qt 5.5.0 RC1 - -* Wed Jun 03 2015 Jan Grulich - 5.4.2-1 -- 5.4.2 - -* Sat May 02 2015 Kalev Lember - 5.4.1-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Fri Feb 27 2015 Rex Dieter - 5.4.1-2 -- rebuild (gcc5) - -* Tue Feb 24 2015 Jan Grulich 5.4.1-1 -- 5.4.1 - -* Mon Feb 16 2015 Rex Dieter 5.4.0-3 -- rebuild (gcc5) - -* Wed Dec 31 2014 Rex Dieter 5.4.0-2 -- BR: pkgconfig(Qt5Qml) > 5.4.0 (#1177986) - -* Wed Dec 10 2014 Rex Dieter 5.4.0-1 -- 5.4.0 (final) - -* Fri Nov 28 2014 Rex Dieter 5.4.0-0.3.rc -- 5.4.0-rc - -* Mon Nov 03 2014 Rex Dieter 5.4.0-0.2.beta -- out-of-tree build, use %%qmake_qt5 - -* Sun Oct 19 2014 Rex Dieter 5.4.0-0.1.beta -- 5.4.0-beta - -* Tue Sep 16 2014 Rex Dieter 5.3.2-1 -- 5.3.2 - -* Sun Aug 17 2014 Fedora Release Engineering - 5.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jun 17 2014 Jan Grulich - 5.3.1-1 -- 5.3.1 - -* Sun Jun 08 2014 Fedora Release Engineering - 5.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 21 2014 Jan Grulich 5.3.0-1 -- 5.3.0 - -* Mon May 05 2014 Rex Dieter 5.2.1-2 -- sanitize .prl file(s) - -* Wed Feb 05 2014 Rex Dieter 5.2.1-1 -- 5.2.1 - -* Mon Jan 27 2014 Rex Dieter 5.2.0-3 -- build -examples only when supported - -* Sun Jan 26 2014 Rex Dieter 5.2.0-2 -- -examples subpkg - -* Thu Jan 02 2014 Rex Dieter 5.2.0-1 -- first try diff --git a/qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch b/qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch deleted file mode 100644 index 4ed7bec..0000000 --- a/qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 diff --git a/sources b/sources deleted file mode 100644 index 5ca201d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -e985bfe7bd544bc7bb44221440f6eaa3 qtlocation-opensource-src-5.6.1.tar.xz