Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at 2019-01-08 12:23:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marble (Old) and /work/SRC/openSUSE:Factory/.marble.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "marble" Tue Jan 8 12:23:10 2019 rev:110 rq:658492 version:18.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/marble/marble.changes 2018-11-13 17:27:11.425482113 +0100 +++ /work/SRC/openSUSE:Factory/.marble.new.28833/marble.changes 2019-01-08 12:25:11.848487788 +0100 @@ -1,0 +2,58 @@ +Fri Dec 14 06:09:21 UTC 2018 - [email protected] + +- Update to 18.12.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.0.php +- Changes since 18.11.90: + * No code changes since 18.11.90 + +------------------------------------------------------------------- +Mon Dec 03 20:56:18 UTC 2018 - [email protected] + +- Update to 18.11.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-rc.php +- Changes since 18.11.80: + * No code changes since 18.11.80 + +------------------------------------------------------------------- +Tue Nov 20 06:23:01 UTC 2018 - Luca Beltrame <[email protected]> + +- Run spec-cleaner + +------------------------------------------------------------------- +Tue Nov 20 05:57:31 UTC 2018 - [email protected] + +- Update to 18.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-beta.php +- Changes since 18.08.3: + * Add donation url to appdata + * Fix Appstreamercli minor issues + * Add caption to the screenshot + * Remove extra semicolons + * Fix qt_Marble.pri file to update to port to QtWebEngine + * Fix MarbleConfig.cmake file to update to port to QtWebEngine + * Example update. + * - Fix another CMake CMP0071 warning - Supress Qt5SerialPort warning for optional aprs plugin + * Differential Revision: https://phabricator.kde.org/D698 + * Adjust the Tropics position. + * Fix minor typo + * Fix minor EBN issues and typos + * Skip SVG in Krazy checks + * BUG: 394517 Changing nominatim to https. (kde#394517) + * Export all of the Astro stuff as well + * Export the CMake target on Windows as well. + * Restore the installation of the CMake target configuration files. + * ensure "make install" on windows also installs development header files + * Avoid "QObject::disconnect: Unexpected null parameter" error on application stop + * Make it possible to build Marble with KDE Android tooling + * latitudes must be normalized with normalizeLat +- Dropped patches, now upstream: + * Fix-MarbleConfig.cmake-to-find-QtWebEngine.patch + * Port-to-QtWebEngine.patch + +------------------------------------------------------------------- @@ -57 +115 @@ - * https://www.kde.org/announcements/announce-applications-18.07.80.php + * https://www.kde.org/announcements/announce-applications-18.08-beta.php @@ -130 +188 @@ - * https://www.kde.org/announcements/announce-applications-18.03.90.php + * https://www.kde.org/announcements/announce-applications-18.04-rc.php @@ -251 +309 @@ - * https://www.kde.org/announcements/announce-applications-17.07.90.php + * https://www.kde.org/announcements/announce-applications-17.08-rc.php @@ -351 +409 @@ - * https://www.kde.org/announcements/announce-applications-17.03.80.php + * https://www.kde.org/announcements/announce-applications-17.04-beta.php @@ -455 +513 @@ - * https://www.kde.org/announcements/announce-applications-16.07.90.php + * https://www.kde.org/announcements/announce-applications-16.08-rc.php @@ -610 +668 @@ - * https://www.kde.org/announcements/announce-applications-15.07.90.php + * https://www.kde.org/announcements/announce-applications-15.08-rc.php Old: ---- Fix-MarbleConfig.cmake-to-find-QtWebEngine.patch Port-to-QtWebEngine.patch marble-18.08.3.tar.xz New: ---- marble-18.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.gAJCuo/_old 2019-01-08 12:25:13.208486294 +0100 +++ /var/tmp/diff_new_pack.gAJCuo/_new 2019-01-08 12:25:13.208486294 +0100 @@ -1,7 +1,7 @@ # # spec file for package marble # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,30 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%bcond_without lang - %define _so -28 %define _so_astro 1 -Name: marble -Version: 18.08.3 -Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang +Name: marble +Version: 18.12.0 +Release: 0 Summary: Generic map viewer # License note: the tools directory contains GPL-3 tools, but they are neither built nor installed by the package -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Amusements/Teaching/Other -Url: http://edu.kde.org +URL: http://edu.kde.org Source0: marble-%{version}.tar.xz -# PATCH-FEATURE-UPSTREAM -Patch0: Port-to-QtWebEngine.patch -# PATCH-FIX-UPSTREAM -Patch1: Fix-MarbleConfig.cmake-to-find-QtWebEngine.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: gpsd-devel @@ -71,10 +66,6 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Test) -%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 -# Only include WebEngine on platforms where it is available -BuildRequires: pkgconfig(Qt5WebEngineWidgets) -%endif BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) Requires: %{name}-data = %{version} @@ -84,10 +75,13 @@ Recommends: %{name}-doc = %{version} Obsoletes: marble5 < %{version} Provides: marble5 < %{version} +%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 +# Only include WebEngine on platforms where it is available +BuildRequires: pkgconfig(Qt5WebEngineWidgets) +%endif %if %{with lang} Recommends: %{name}-lang %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Marble is a viewer of map data. @@ -96,7 +90,7 @@ Summary: Qt Frontend for Marble Group: Amusements/Teaching/Other Requires: %{name} = %{version} -Conflicts: otherproviders(marble-frontend) +Conflicts: marble-frontend Provides: marble-frontend = %{version} %description qt @@ -107,7 +101,7 @@ Group: Amusements/Teaching/Other Requires: %{name} = %{version} Supplements: packageand(marble:plasma5-desktop) -Conflicts: otherproviders(marble-frontend) +Conflicts: marble-frontend Provides: marble-frontend = %{version} %description kde @@ -129,13 +123,13 @@ Group: Development/Libraries/KDE Requires: libastro%{_so_astro} = %{version} Requires: libmarblewidget-qt5%{_so} = %{version} -%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 -Requires: pkgconfig(Qt5WebEngineWidgets) -%endif Requires: pkgconfig(Qt5Widgets) Requires: pkgconfig(Qt5Xml) Obsoletes: marble5-devel < %{version} Provides: marble5-devel = %{version} +%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 +Requires: pkgconfig(Qt5WebEngineWidgets) +%endif %description devel Development headers and libraries for Marble. @@ -174,7 +168,6 @@ %prep %setup -q -n marble-%{version} -%autopatch -p1 %build export SUSE_ASNEEDED=0 @@ -188,7 +181,7 @@ %kf5_makeinstall -C build %if %{with lang} %find_lang %{name} --with-man --all-name --with-qt - %kf5_find_htmldocs + %{kf5_find_htmldocs} %endif %fdupes %{buildroot} @@ -198,8 +191,8 @@ %postun -n libastro%{_so_astro} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt +%license COPYING* LICENSE* +%doc CREDITS ChangeLog MANIFESTO.txt %config %{_kf5_configdir}/marble.knsrc %exclude %{_datadir}/marble/data %{_kf5_applicationsdir}/marble_geo.desktop @@ -224,7 +217,6 @@ %{_kf5_sharedir}/mime/packages/geo.xml %files devel -%defattr(-,root,root) %doc BUGS CODING %{_includedir}/astro/ %{_includedir}/marble/ @@ -235,28 +227,22 @@ %{_kf5_mkspecsdir}/qt_Marble.pri %files data -%defattr(-,root,root) %{_datadir}/marble/data %files doc -%defattr(-,root,root) %doc %lang(en) %{_kf5_htmldir}/en/marble/ %files -n libmarblewidget-qt5%{_so} -%defattr(-,root,root) %{_kf5_libdir}/libmarblewidget-qt5.so.* %files -n libastro%{_so_astro} -%defattr(-,root,root) %{_kf5_libdir}/libastro.so.* %files qt -%defattr(-,root,root) %{_kf5_applicationsdir}/org.kde.marble-qt.desktop %{_kf5_bindir}/marble-qt %files kde -%defattr(-,root,root) %{_kf5_applicationsdir}/org.kde.marble.desktop %{_kf5_bindir}/marble %dir %{_datadir}/plasma @@ -265,7 +251,7 @@ %if %{with lang} %files lang -f %{name}.lang -%doc COPYING* +%license COPYING* %endif %changelog ++++++ marble-18.08.3.tar.xz -> marble-18.12.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/marble/marble-18.08.3.tar.xz /work/SRC/openSUSE:Factory/.marble.new.28833/marble-18.12.0.tar.xz differ: char 26, line 1
