From 86cac54ebd6da79b721606659ea156833162c1812262fb7e38b433b4269cdb10 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 28 Mar 2020 13:58:33 +0000 Subject: [PATCH 1/3] KDE Applications 20.03.80 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=200 --- marble-19.12.3.tar.xz | 3 --- marble-19.12.3.tar.xz.sig | 11 ----------- marble-20.03.80.tar.xz | 3 +++ marble-20.03.80.tar.xz.sig | 16 ++++++++++++++++ marble.changes | 9 +++++++++ marble.spec | 28 ++++++++++++++-------------- 6 files changed, 42 insertions(+), 28 deletions(-) delete mode 100644 marble-19.12.3.tar.xz delete mode 100644 marble-19.12.3.tar.xz.sig create mode 100644 marble-20.03.80.tar.xz create mode 100644 marble-20.03.80.tar.xz.sig 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.03.80.tar.xz b/marble-20.03.80.tar.xz new file mode 100644 index 0000000..a708f9f --- /dev/null +++ b/marble-20.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:447292cf1f6464d11960ac45f2bfcdb8b1ec15f5ccef2139e109cd932f647247 +size 52575252 diff --git a/marble-20.03.80.tar.xz.sig b/marble-20.03.80.tar.xz.sig new file mode 100644 index 0000000..da858a8 --- /dev/null +++ b/marble-20.03.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl50vCQACgkQOmpNuDnq +pteb4A/9EYWiQTC3aLGtI7Pq5ZqJGauDivX+Uo87D1INU5Mvy3F+1cr2X2vYFf+3 +MEBZwD726BwYtitkMhtNSERKRnRdHgPGGy5gNY2CJ5w8H4U0/3K+OQ4P+wFiac2q +IKadR7SU4lFixT8P7k8NQE7GNVZAxHQBxVmToNH9Vex2TAsKTvzPBih0UGqRJc+u +guXwMoZuzRmlZuuQF1vdLNfaGrrldlsQim0CsHZA+9Z79PcyUwqykxQ/++ALwgGE +Ob58PZfcLnWIBv8MK6tjqklLzAKFgVOpj1DSXoGgpmdWBz/w4Oi75Gsl3Pyukcss +W5ENdPni1HV6q6PymQIHgMSOvmy8G6si5K3G2WSFs0sojUn2TkvBK+k5cEwNSQUi +x1U4zccGqbuh8NEo1jFN13f5mqvpP6roOu3ms6Pr+w+SlxzJon7T4b/hr4Jdd3lI +s+i1lJbBnxR4CewU8Zxuych6qRAm+6+SsXaUZ5h3OKsI/ygMY5C8fsjuLGrEbaHH +BE64+khYGyoiFSVhoJfCrbVn7biG6XD+/jTYBCFDInFJYUBH7BjkgWygVOQecBnV +8pL5A0AH5KCE/EX9xdMydyFN/x2nnNcQvTl76g3hqhepp9ytftpastSlU0U7ryEy +53e2Bn+w6kFg/YmAWcKdsLVeTc1mg3LyC/WWu9zQNiZIEEtIODg= +=gghg +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index a54ad2f..0444652 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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..42600e7 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,38 +23,34 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: marble -Version: 19.12.3 +Version: 20.03.80 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/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 +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz 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/unstable/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} From 02c7cf0c3e348e797781d25ee99b33de90324745b8c41272c2da21d77083f41f Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 7 Apr 2020 11:10:32 +0000 Subject: [PATCH 2/3] KDE Applications 20.03.90 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=201 --- marble-20.03.80.tar.xz | 3 --- marble-20.03.80.tar.xz.sig | 16 ---------------- marble-20.03.90.tar.xz | 3 +++ marble-20.03.90.tar.xz.sig | 11 +++++++++++ marble.changes | 10 ++++++++++ marble.spec | 2 +- 6 files changed, 25 insertions(+), 20 deletions(-) delete mode 100644 marble-20.03.80.tar.xz delete mode 100644 marble-20.03.80.tar.xz.sig create mode 100644 marble-20.03.90.tar.xz create mode 100644 marble-20.03.90.tar.xz.sig diff --git a/marble-20.03.80.tar.xz b/marble-20.03.80.tar.xz deleted file mode 100644 index a708f9f..0000000 --- a/marble-20.03.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:447292cf1f6464d11960ac45f2bfcdb8b1ec15f5ccef2139e109cd932f647247 -size 52575252 diff --git a/marble-20.03.80.tar.xz.sig b/marble-20.03.80.tar.xz.sig deleted file mode 100644 index da858a8..0000000 --- a/marble-20.03.80.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl50vCQACgkQOmpNuDnq -pteb4A/9EYWiQTC3aLGtI7Pq5ZqJGauDivX+Uo87D1INU5Mvy3F+1cr2X2vYFf+3 -MEBZwD726BwYtitkMhtNSERKRnRdHgPGGy5gNY2CJ5w8H4U0/3K+OQ4P+wFiac2q -IKadR7SU4lFixT8P7k8NQE7GNVZAxHQBxVmToNH9Vex2TAsKTvzPBih0UGqRJc+u -guXwMoZuzRmlZuuQF1vdLNfaGrrldlsQim0CsHZA+9Z79PcyUwqykxQ/++ALwgGE -Ob58PZfcLnWIBv8MK6tjqklLzAKFgVOpj1DSXoGgpmdWBz/w4Oi75Gsl3Pyukcss -W5ENdPni1HV6q6PymQIHgMSOvmy8G6si5K3G2WSFs0sojUn2TkvBK+k5cEwNSQUi -x1U4zccGqbuh8NEo1jFN13f5mqvpP6roOu3ms6Pr+w+SlxzJon7T4b/hr4Jdd3lI -s+i1lJbBnxR4CewU8Zxuych6qRAm+6+SsXaUZ5h3OKsI/ygMY5C8fsjuLGrEbaHH -BE64+khYGyoiFSVhoJfCrbVn7biG6XD+/jTYBCFDInFJYUBH7BjkgWygVOQecBnV -8pL5A0AH5KCE/EX9xdMydyFN/x2nnNcQvTl76g3hqhepp9ytftpastSlU0U7ryEy -53e2Bn+w6kFg/YmAWcKdsLVeTc1mg3LyC/WWu9zQNiZIEEtIODg= -=gghg ------END PGP SIGNATURE----- diff --git a/marble-20.03.90.tar.xz b/marble-20.03.90.tar.xz new file mode 100644 index 0000000..1c3bc7f --- /dev/null +++ b/marble-20.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25a37642e672498a17d439e19883ecf7a05d3601dae3bcbdf4aeee5d91b547d3 +size 52605920 diff --git a/marble-20.03.90.tar.xz.sig b/marble-20.03.90.tar.xz.sig new file mode 100644 index 0000000..ff8f666 --- /dev/null +++ b/marble-20.03.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl6G3u4ACgkQ29LOiT4t +HIekkQf/RlV/4jkM0q8JEuCFkCCM6qmtH8qXJMKZEV6p4r4vt758C0I/jBLaTJb9 +0eV9szyrJkIrhdy9+lKQxP01ADyQJuOCj0ujERbzVkB9ATINTyQV1Zx7esZ4u7aV +rdpaDMNzh4KojC4FDTaEsO4ohsM71allAlqeGFM9SappJJuUU7CwdYjQOX7CiCn6 +AWh70Ruxjl5ZK1Spjos1+mVR/IG6F/Ubzip2NU5HGIWhyBZ562p6YeHkAiWYG0lM +h/udJKlsilMHnCnPvcHx3cX8YRJtMVjt5EOIRaqhogrxGif5elctzJgHo4H/OYzH +eKBGG2roWwHjL0s9fDM1Z1l0vsO5YA== +=WyHB +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index 0444652..cca7fb0 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 diff --git a/marble.spec b/marble.spec index 42600e7..2c19867 100644 --- a/marble.spec +++ b/marble.spec @@ -23,7 +23,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: marble -Version: 20.03.80 +Version: 20.03.90 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 From dbce4c3b5206dcee4101714450af083ecdaa7c2fb86b2f26d96b887ba6ac22e4 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 24 Apr 2020 07:24:22 +0000 Subject: [PATCH 3/3] KDE Applications 20.04.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=202 --- marble-20.03.90.tar.xz | 3 --- marble-20.03.90.tar.xz.sig | 11 ----------- marble-20.04.0.tar.xz | 3 +++ marble-20.04.0.tar.xz.sig | 11 +++++++++++ marble.changes | 9 +++++++++ marble.spec | 6 +++--- 6 files changed, 26 insertions(+), 17 deletions(-) delete mode 100644 marble-20.03.90.tar.xz delete mode 100644 marble-20.03.90.tar.xz.sig create mode 100644 marble-20.04.0.tar.xz create mode 100644 marble-20.04.0.tar.xz.sig diff --git a/marble-20.03.90.tar.xz b/marble-20.03.90.tar.xz deleted file mode 100644 index 1c3bc7f..0000000 --- a/marble-20.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25a37642e672498a17d439e19883ecf7a05d3601dae3bcbdf4aeee5d91b547d3 -size 52605920 diff --git a/marble-20.03.90.tar.xz.sig b/marble-20.03.90.tar.xz.sig deleted file mode 100644 index ff8f666..0000000 --- a/marble-20.03.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl6G3u4ACgkQ29LOiT4t -HIekkQf/RlV/4jkM0q8JEuCFkCCM6qmtH8qXJMKZEV6p4r4vt758C0I/jBLaTJb9 -0eV9szyrJkIrhdy9+lKQxP01ADyQJuOCj0ujERbzVkB9ATINTyQV1Zx7esZ4u7aV -rdpaDMNzh4KojC4FDTaEsO4ohsM71allAlqeGFM9SappJJuUU7CwdYjQOX7CiCn6 -AWh70Ruxjl5ZK1Spjos1+mVR/IG6F/Ubzip2NU5HGIWhyBZ562p6YeHkAiWYG0lM -h/udJKlsilMHnCnPvcHx3cX8YRJtMVjt5EOIRaqhogrxGif5elctzJgHo4H/OYzH -eKBGG2roWwHjL0s9fDM1Z1l0vsO5YA== -=WyHB ------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 cca7fb0..e3e4a9c 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 diff --git a/marble.spec b/marble.spec index 2c19867..50dd310 100644 --- a/marble.spec +++ b/marble.spec @@ -23,14 +23,14 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: marble -Version: 20.03.90 +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 License: LGPL-2.1-or-later Group: Amusements/Teaching/Other URL: https://edu.kde.org -Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: gpsd-devel @@ -75,7 +75,7 @@ Recommends: %{name}-lang Obsoletes: marble5 < %{version} Provides: marble5 < %{version} %if %{with lang} -Source1: https://download.kde.org/unstable/release-service/%{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 %ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64