diff --git a/marble-19.12.3.tar.xz b/marble-19.12.3.tar.xz deleted file mode 100644 index 4871ef7..0000000 --- a/marble-19.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73a2c5234f8a1728e2a97499166e7bbf8dfb2f48d10fe8cff96380631d064627 -size 52306988 diff --git a/marble-19.12.3.tar.xz.sig b/marble-19.12.3.tar.xz.sig deleted file mode 100644 index fe96965..0000000 --- a/marble-19.12.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl5drZkACgkQ29LOiT4t -HIdFlggAinB5g051gRFAVCij9KnRtIz3Kkt2hvUB5kvRCV/NxDN4c8JfB6AAdxlo -phk8ppDpLwB7cFJCZugLgdKUP30Cbv4KtvnPCc+PhhBSink7kTGyVK2z2BXd/e/6 -TRxys/9BGzowtT7Cl9bFQHCLs7QrWJoK7xJCbmDAxrgu81txV8rCN3Ch5BvJtPNM -wkj/uuBS/kNCNdV1zPiNo9gKiWGEmmGMDM6Hh6fOyx6ILK3wdWBsea1Ev3iLrnZY -QagqGr5/urVriMcv5g1o9bIRpX3gf9QivRiSDGeG9rbZQi8N7hhEIptTpRDGx/9s -erRo8rr+pHJSyLtQvBqJyKUWjZWyhw== -=Bjyu ------END PGP SIGNATURE----- diff --git a/marble-20.04.0.tar.xz b/marble-20.04.0.tar.xz new file mode 100644 index 0000000..f29aa47 --- /dev/null +++ b/marble-20.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:045c94eeb11269d79145ac754f258320fa6d3eeb91ffdd6b88c0c214c6e8eb48 +size 52193636 diff --git a/marble-20.04.0.tar.xz.sig b/marble-20.04.0.tar.xz.sig new file mode 100644 index 0000000..43bb69d --- /dev/null +++ b/marble-20.04.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl6ZB/YACgkQ29LOiT4t +HIfg8Af9HK/a0uQPIDO5fyw9PNoh8pY58fg4wFk5z1r6IJotOJXBv7LuzsbhbBUU +jjh5AqiWFv3N4s4JdLEsBZxSoBR3pikWUlcv/2gxc+Bz8ee6pHfuTk9Jadp9vtjt +N4vC64WiXBEnzjDb/vl3AfcqKxeTZhE+yaJiX5AfOZe4zNAc8OAstPsrIaDL2INa +9l4S85tdPuFMUD2SQozxFUcycfkEKmo5Ca8WV9aBh3/OJxZi4bmgx4yDSIX3LcG1 +CJ6QN1HbP48qQJMVmTtJ1MzATREamjNPpMXbb1+sTpJ5DbghofXUGFdwqw0TR0MB +nWESzCjGNNtC1kE72dxPW4wwGEwDZw== +=NynV +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index a54ad2f..e3e4a9c 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Apr 23 12:23:13 UTC 2020 - Luca Beltrame + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- No code change since 20.03.90 + +------------------------------------------------------------------- +Sun Apr 5 20:30:43 UTC 2020 - Luca Beltrame + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- Changes since 20.03.80: + * Fix build with Qt 5.15 + +------------------------------------------------------------------- +Sun Mar 22 09:17:40 UTC 2020 - Luca Beltrame + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Too many changes to list here. + ------------------------------------------------------------------- Thu Mar 5 20:36:47 UTC 2020 - Luca Beltrame diff --git a/marble.spec b/marble.spec index 03923a7..50dd310 100644 --- a/marble.spec +++ b/marble.spec @@ -1,7 +1,7 @@ # # spec file for package marble # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: marble -Version: 19.12.3 +Version: 20.04.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 @@ -31,30 +31,26 @@ License: LGPL-2.1-or-later Group: Amusements/Teaching/Other URL: https://edu.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz -%if %{with lang} -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: kf5-filesystem +BuildRequires: libqt5-qtlocation-devel +BuildRequires: libshp-devel +BuildRequires: perl BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5DocTools) -BuildRequires: kf5-filesystem BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5NewStuff) BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5Plasma) BuildRequires: cmake(KF5Runner) BuildRequires: cmake(KF5Service) BuildRequires: cmake(KF5Wallet) BuildRequires: cmake(KF5WindowSystem) -BuildRequires: libqt5-qtlocation-devel -BuildRequires: libshp-devel -BuildRequires: perl BuildRequires: cmake(Phonon4Qt5) -BuildRequires: cmake(KF5Plasma) BuildRequires: cmake(Qt5Concurrent) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) @@ -75,13 +71,17 @@ Requires: libastro%{_so_astro} = %{version} Requires: libmarblewidget-qt5%{_so} = %{version} Requires: marble-frontend = %{version} Recommends: %{name}-doc = %{version} +Recommends: %{name}-lang Obsoletes: marble5 < %{version} Provides: marble5 < %{version} +%if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif %ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 # Only include WebEngine on platforms where it is available BuildRequires: cmake(Qt5WebEngineWidgets) %endif -Recommends: %{name}-lang %description Marble is a viewer of map data. @@ -100,7 +100,7 @@ The Qt frontend for the Marble map viewer Summary: The KDE optimized frontend for Marble and several Plasmoids/Wallpapers Group: Amusements/Teaching/Other Requires: %{name} = %{version} -Supplements: packageand(marble:plasma5-desktop) +Supplements: (marble and plasma5-desktop) Conflicts: marble-frontend Provides: marble-frontend = %{version}