diff --git a/applications.keyring b/applications.keyring index 57c966e..48be415 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/marble-19.08.3.tar.xz b/marble-19.08.3.tar.xz deleted file mode 100644 index ce89298..0000000 --- a/marble-19.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd5d7f758d2234dc8e2fa638b9e1326461655e10dbe21910dbef029e80ef7a68 -size 52406676 diff --git a/marble-19.08.3.tar.xz.sig b/marble-19.08.3.tar.xz.sig deleted file mode 100644 index 995b9cd..0000000 --- a/marble-19.08.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl3A/PMACgkQ29LOiT4t -HId8qAf7BmkAnKZJk2J6aGK1S75Ib9zbWfUpumV1WeRTGX7+PBSOZpLI6HpHngUW -FjJNsUFQE5LKUD2r7Zhoj7yZ/ASoNgzEqGq2nEWiRoh5So9EhtChLUo0MI+5NbsJ -qKL6Rhs6eDmWHdu/Y078AUQUKrBc/ZVpzWYv9s0R1fNbYn8P0VeTa3iYvqnsNbuV -JxqVsqLAdUMZZBQ0r0mZ3ldSbIECZa7iN6BbtURH1Nw7Rit6MNmUolgjT3h+nN4e -gxkAcDJtcK1JMHP8pcL+Ptb/tXGiAgJ2eOZeVOVhpehyWsOmi5sL1XjG3E0E/J3u -dqijz5kf8iBX823isgxzy7aWZJyzdg== -=A5eg ------END PGP SIGNATURE----- diff --git a/marble-19.12.0.tar.xz b/marble-19.12.0.tar.xz new file mode 100644 index 0000000..ada79f0 --- /dev/null +++ b/marble-19.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3703714ceb49cf0b7b7db75c021509d0bb65748d2391bc8104089d801e85c54 +size 52194536 diff --git a/marble-19.12.0.tar.xz.sig b/marble-19.12.0.tar.xz.sig new file mode 100644 index 0000000..30f9299 --- /dev/null +++ b/marble-19.12.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl3puKwACgkQ29LOiT4t +HId4MwgAh/4ylNnF6fC+NhrY4SzIAuWFESSObmppd4bSyzfNSjo6+hXwOvh3zB4m +PGi3jFqAFrD7bEiTunemL8RpFYpnVNWTyyLJ+8/jhucNe83sLedBdOgVoR0E0o9i +9pWRl/gYyQlgIQEqq/40x8Gxx4jVC6twpjvU51lyiNRsz1jrS2sOSZ/be5t/9q+A +LfUH9anVukjshrQzg77tSsYDlagLABqkNsiI+g/fQk68XHekwZk33/oFXkH7lJ8y +EQ1hqHksCF5D9lKk9BISuiA2R+jo7SAZ2hIM/Z6JeVh9bKi4HzwouHDjHoJSX5B1 +fLKaZTn67OaQe+M+mhjBZAKY6PmirA== +=GR9f +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index 2c97e54..d5775c1 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Dec 10 06:39:12 UTC 2019 - Luca Beltrame + +- Update to 19.12.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/releases/19.12.0 +- No code change since 19.11.90 + +------------------------------------------------------------------- +Sat Nov 30 09:12:32 UTC 2019 - Luca Beltrame + +- Update to 19.11.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/19.12-rc +- No code change since 19.11.80 + +------------------------------------------------------------------- +Sun Nov 24 15:54:26 UTC 2019 - Luca Beltrame + +- Update to 19.11.80 + * New feature release +- Too many changes to list here. + ------------------------------------------------------------------- Thu Nov 7 23:13:36 UTC 2019 - Luca Beltrame diff --git a/marble.spec b/marble.spec index 193ddb9..f3a984e 100644 --- a/marble.spec +++ b/marble.spec @@ -18,59 +18,58 @@ %define _so -28 %define _so_astro 1 -%define kf5_version 5.26.0 +%define kf5_version 5.60.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: 19.08.3 +Version: 19.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-or-later Group: Amusements/Teaching/Other URL: https://edu.kde.org -Source: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: gpsd-devel -BuildRequires: kconfig-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kcrash-devel -BuildRequires: kdoctools-devel +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5Crash) +BuildRequires: cmake(KF5DocTools) BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel -BuildRequires: knewstuff-devel -BuildRequires: kparts-devel -BuildRequires: krunner-devel -BuildRequires: kservice-devel -BuildRequires: kwallet-devel -BuildRequires: kwindowsystem-devel +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5NewStuff) +BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5Runner) +BuildRequires: cmake(KF5Service) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5WindowSystem) BuildRequires: libqt5-qtlocation-devel BuildRequires: libshp-devel BuildRequires: perl -BuildRequires: phonon4qt5-devel -BuildRequires: pkgconfig -BuildRequires: plasma-framework-devel -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Designer) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5OpenGL) -BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(Qt5Script) -BuildRequires: pkgconfig(Qt5SerialPort) -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: cmake(Phonon4Qt5) +BuildRequires: cmake(KF5Plasma) +BuildRequires: cmake(Qt5Concurrent) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Designer) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5OpenGL) +BuildRequires: cmake(Qt5PrintSupport) +BuildRequires: cmake(Qt5Quick) +BuildRequires: cmake(Qt5Script) +BuildRequires: cmake(Qt5SerialPort) +BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5Xml) Requires: %{name}-data = %{version} Requires: libastro%{_so_astro} = %{version} Requires: libmarblewidget-qt5%{_so} = %{version} @@ -80,7 +79,7 @@ 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) +BuildRequires: cmake(Qt5WebEngineWidgets) %endif Recommends: %{name}-lang @@ -124,12 +123,12 @@ Summary: Generic map viewer: Build Environment Group: Development/Libraries/KDE Requires: libastro%{_so_astro} = %{version} Requires: libmarblewidget-qt5%{_so} = %{version} -Requires: pkgconfig(Qt5Widgets) -Requires: pkgconfig(Qt5Xml) +Requires: cmake(Qt5Widgets) +Requires: cmake(Qt5Xml) Obsoletes: marble5-devel < %{version} Provides: marble5-devel = %{version} %ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 -Requires: pkgconfig(Qt5WebEngineWidgets) +Requires: cmake(Qt5WebEngineWidgets) %endif %description devel