From 945d470a129b6bbb16c7d9c02dc441a255466d45de680c2b87e7779dbf011d59 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 27 Jul 2021 09:36:04 +0000 Subject: [PATCH 1/4] Gear 21.08 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=233 --- marble-21.04.3.tar.xz | 3 --- marble-21.04.3.tar.xz.sig | 16 ---------------- marble-21.07.80.tar.xz | 3 +++ marble-21.07.80.tar.xz.sig | 16 ++++++++++++++++ marble.changes | 19 +++++++++++++++++++ marble.spec | 8 +++----- 6 files changed, 41 insertions(+), 24 deletions(-) delete mode 100644 marble-21.04.3.tar.xz delete mode 100644 marble-21.04.3.tar.xz.sig create mode 100644 marble-21.07.80.tar.xz create mode 100644 marble-21.07.80.tar.xz.sig diff --git a/marble-21.04.3.tar.xz b/marble-21.04.3.tar.xz deleted file mode 100644 index 0be3b67..0000000 --- a/marble-21.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65 -size 52386284 diff --git a/marble-21.04.3.tar.xz.sig b/marble-21.04.3.tar.xz.sig deleted file mode 100644 index a13fa63..0000000 --- a/marble-21.04.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmDj534ACgkQu0YzUNbv -Me///xAAkFcxGFe53MrEy8uHyUohUEvc5To1KrY2WzR2KUoJKt7TU9Xi1UeHvmzq -6vQO5px4/IHkrz2ZdwdeeyMuDjL1SLYu6+b8gHpAZrLmY9c9TMnkF5wasAZoZv4e -MZpk2UcEhKWo/wIfCKcQO7eKm1PuwC1FCO+mq6xLcNjP8ZBQGYYr6UqaTGpAX+YJ -a6s6eit+e+2ifqdY1rWjyo5krecND6VAgbWdlvsQ7cEaTEZNs2h2zDNj+0aWUAlQ -zFP/MRuu4UE53/zP/ql3BQbi4nHHAvw++nWi4tI8xk35P1/WOMbyDffI0JNViK7B -iS4sqDIP10G5W3z3V3R82hlXdNxjj78wsRki25YCNlVXhMWPvaNxgnzGuBT4I97Q -wEa2tDGTjDVmWNs1PuDKoapZmnnTX3CUNV8zQU6X+pnIXDTB2v0pf65XupvZ+gYj -dEVCMwkb83GnvuNfSLHyXFzBCeDCWG+1b6ILiQEldCGxYhbZNH3S4XfCJZop3D0j -GmdyZo71dRNVgT8f7Ode6PvSrzAs57R7BrI3OZRXPL8J07sbNV3Mh/froqaXsQjI -wkDk8YG5bBjqUPyMNOEHYuRfvfZf1BN183EPtnFBUanB1ypdYl+QAaNWSWIQuuEN -u8iyEtxqn/yr9I/bkILoFoFAtf2krdve7ySZJ0sSFayLIQaY2r4= -=QRFx ------END PGP SIGNATURE----- diff --git a/marble-21.07.80.tar.xz b/marble-21.07.80.tar.xz new file mode 100644 index 0000000..491efaf --- /dev/null +++ b/marble-21.07.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b55705acac96bb22d9dfa402c6a6a7f76f43221485f5e0e3b46d44e1385bebd +size 52388376 diff --git a/marble-21.07.80.tar.xz.sig b/marble-21.07.80.tar.xz.sig new file mode 100644 index 0000000..a4558df --- /dev/null +++ b/marble-21.07.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmDxi58ACgkQOmpNuDnq +ptc+kg//VBGyU8nbwMScU74m7EeC65tBEu2nUF5v/OfFHMywYKBR3NuMrAYvjfHO +42pi3nSGYBww/sOeptp0hL89UlVUEmatqTTpBz5UZHfbcjBs03J0OC9GA6A8W9Mm +i+OhQxoZHBxbCzZ8yEg9Q0V8xm4npikqZEllmkYj8UH03mQkiJgAcLXLsUO8yJo5 +w7J3tVMb50vyygW7QPM9bbGCInhaH69koQIDfw927U/f88XofKGuv2mc9lF30H1k +AWmQqUbiyOSXPxqswROrRiT0RvSy8dm5uDNrCpjY33TveMmDLzD1lJop0uYpCeRX +9RU0bHnLfkR+1J2vZq+Nn0YDR26XD9lJ08kyPavuoX+kmx8JXj5skRmOLk9HtCTz +x0RlX6mhzEpOK3sFQyooGDXqnoJWJKqE7TE3eVPh1ngaz3DJHDTwmkLSdStstByl +pzBGPOCEsmYbCot8/1IA/NBHXybtUfHFu/hDJycFwl2Th2iB/IWFQyC/SbJLcAHw +u44LW3pF/GHhEC1gJmkmLS4ULcBlHc5QkNKH8ByI3nChv2yIzv+ZjFSpdNjsial5 +2fZl/rY5PI5aUsHPwoOoSIw7lQ2ritS95/cqUXnU2lwKHCJpDnstmF6ds0PepKux +cNLvgj747Z4QJM/0iqWPGM91jBEAluQFxoW10n6wcWI5vm78ARE= +=T0+R +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index 4bdbb4c..1d72ba4 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat Jul 17 20:07:02 UTC 2021 - Christophe Giboudeaux + +- Update to 21.07.80 + * New feature release +- Changes since 21.04.3: + * Remove KNewStuff2 group from knsrc file + * Update outdated note in the setup instructions + * Avoid the need to set Qt::WA_DeleteOnClose on widgets using Marble + * Add toVariantList-function to GeoDataLineString. + * Adding moveLeft, Right, Up, Down and minimum/maximumZoom to MarbleQuickItem. + * Revert changes on Windows data and plugins path + * Additions to MarbleQuickItem QML element + * fix data directory on Windows platforms + * Bump marble version number in cmake as well. + * Bump marble version + * Add dummy desktop file to make apps.kde.org happy +- Only install the license files once + ------------------------------------------------------------------- Wed Jul 7 08:59:01 UTC 2021 - Christophe Giboudeaux diff --git a/marble.spec b/marble.spec index c926f64..3c1a7a6 100644 --- a/marble.spec +++ b/marble.spec @@ -23,16 +23,16 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: marble -Version: 21.04.3 +Version: 21.07.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://apps.kde.org/marble -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/unstable/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 +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif BuildRequires: extra-cmake-modules @@ -75,7 +75,6 @@ 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} %ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 @@ -254,7 +253,6 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %if %{with lang} %files lang -f %{name}.lang -%license COPYING* %endif %changelog From 2524982c47e3bd3471e36dd75f025f645106cffbc4bf54e51076b0f08e35f5a0 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 3 Aug 2021 20:00:46 +0000 Subject: [PATCH 2/4] KDE Gear 21.08 rc OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=234 --- marble-21.07.80.tar.xz | 3 --- marble-21.07.80.tar.xz.sig | 16 ---------------- marble-21.07.90.tar.xz | 3 +++ marble-21.07.90.tar.xz.sig | 16 ++++++++++++++++ marble.changes | 7 +++++++ marble.spec | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 marble-21.07.80.tar.xz delete mode 100644 marble-21.07.80.tar.xz.sig create mode 100644 marble-21.07.90.tar.xz create mode 100644 marble-21.07.90.tar.xz.sig diff --git a/marble-21.07.80.tar.xz b/marble-21.07.80.tar.xz deleted file mode 100644 index 491efaf..0000000 --- a/marble-21.07.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b55705acac96bb22d9dfa402c6a6a7f76f43221485f5e0e3b46d44e1385bebd -size 52388376 diff --git a/marble-21.07.80.tar.xz.sig b/marble-21.07.80.tar.xz.sig deleted file mode 100644 index a4558df..0000000 --- a/marble-21.07.80.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmDxi58ACgkQOmpNuDnq -ptc+kg//VBGyU8nbwMScU74m7EeC65tBEu2nUF5v/OfFHMywYKBR3NuMrAYvjfHO -42pi3nSGYBww/sOeptp0hL89UlVUEmatqTTpBz5UZHfbcjBs03J0OC9GA6A8W9Mm -i+OhQxoZHBxbCzZ8yEg9Q0V8xm4npikqZEllmkYj8UH03mQkiJgAcLXLsUO8yJo5 -w7J3tVMb50vyygW7QPM9bbGCInhaH69koQIDfw927U/f88XofKGuv2mc9lF30H1k -AWmQqUbiyOSXPxqswROrRiT0RvSy8dm5uDNrCpjY33TveMmDLzD1lJop0uYpCeRX -9RU0bHnLfkR+1J2vZq+Nn0YDR26XD9lJ08kyPavuoX+kmx8JXj5skRmOLk9HtCTz -x0RlX6mhzEpOK3sFQyooGDXqnoJWJKqE7TE3eVPh1ngaz3DJHDTwmkLSdStstByl -pzBGPOCEsmYbCot8/1IA/NBHXybtUfHFu/hDJycFwl2Th2iB/IWFQyC/SbJLcAHw -u44LW3pF/GHhEC1gJmkmLS4ULcBlHc5QkNKH8ByI3nChv2yIzv+ZjFSpdNjsial5 -2fZl/rY5PI5aUsHPwoOoSIw7lQ2ritS95/cqUXnU2lwKHCJpDnstmF6ds0PepKux -cNLvgj747Z4QJM/0iqWPGM91jBEAluQFxoW10n6wcWI5vm78ARE= -=T0+R ------END PGP SIGNATURE----- diff --git a/marble-21.07.90.tar.xz b/marble-21.07.90.tar.xz new file mode 100644 index 0000000..60dce16 --- /dev/null +++ b/marble-21.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33277796e54ce7639eb8906a29de56d51be4b0639532aba57bcdbee7b40cc1b1 +size 52397056 diff --git a/marble-21.07.90.tar.xz.sig b/marble-21.07.90.tar.xz.sig new file mode 100644 index 0000000..328ec45 --- /dev/null +++ b/marble-21.07.90.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEDnasACgkQu0YzUNbv +Me+YFw//VQut9kBo1N3ZNgL8Mqtn8KwXSEnQxAbevpWwnJk5dFxo33SVmHwlmkYL +0aPkOpISnHPef0M9IftUdkhKA2v+bdZbTK7Lt+HxyVimjoTaxTMhQPXptGyLeePN +ahLBVmvpAbNJ0GbuRJ62QMwPG4TNHkcZam7c6k5BEosabZEynVCKIRKr9Vmz5JCV ++ekP9dG8mUd0vRSAWq45biujd+ll1x7oDGUgsXIK1zSSEYKxHt2rIqftFb3MupZZ +UYt8tsRefPiG5r3zy5L8cjaP18AkW0aOnfDIPIo4OJ9UGY0buxnf4MLIWzrPZ8+7 +Cnnj8iuN1giEatuH4v1rMBReJlC4CQYQzyM2iUFTKFS/LYlO57MoUMhz/hvoRfW5 +1wybllNJGgeat7iHFGoi2pSMUbQYw2UOrtpraXVxTTvFRlB4JF6dZa53UVjdKCrg +F0QCfw4MMPdvKa5D712D/IH8AULHt9S5RXk0iJjKHzFQ/irjl2mnJyR+aYQeyv/W +5H9sl4aQ8PKoJxI/x57W3AxEHcF+9elUX2LGDN1BwltdYraZKA2GSpkgxxDGEmBD +d1i2CZKjPlX8tL5SyWhKKcSGIhtWD29QvzjsrUXolTZq6UP/D6af8RZY/GLiOL3/ +S637dGWdCs4dottwrVdezE9+zwlYUS5rkh3trPv6V9huNkiF5es= +=XbWY +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index 1d72ba4..d4a592a 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 30 10:05:52 UTC 2021 - Christophe Giboudeaux + +- Update to 21.07.90 + * New feature release +- No code change since 21.07.80 + ------------------------------------------------------------------- Sat Jul 17 20:07:02 UTC 2021 - Christophe Giboudeaux diff --git a/marble.spec b/marble.spec index 3c1a7a6..c2ae32a 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: 21.07.80 +Version: 21.07.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 32ab61ae203f22fbde6f17371f2a3e540922c997f979700e486521fce1573e8d Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 7 Aug 2021 11:17:32 +0000 Subject: [PATCH 3/4] KDE Gear 21.08 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=235 --- marble-21.07.90.tar.xz | 3 --- marble-21.07.90.tar.xz.sig | 16 ---------------- marble-21.08.0.tar.xz | 3 +++ marble-21.08.0.tar.xz.sig | 16 ++++++++++++++++ marble.changes | 9 +++++++++ marble.spec | 6 +++--- 6 files changed, 31 insertions(+), 22 deletions(-) delete mode 100644 marble-21.07.90.tar.xz delete mode 100644 marble-21.07.90.tar.xz.sig create mode 100644 marble-21.08.0.tar.xz create mode 100644 marble-21.08.0.tar.xz.sig diff --git a/marble-21.07.90.tar.xz b/marble-21.07.90.tar.xz deleted file mode 100644 index 60dce16..0000000 --- a/marble-21.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33277796e54ce7639eb8906a29de56d51be4b0639532aba57bcdbee7b40cc1b1 -size 52397056 diff --git a/marble-21.07.90.tar.xz.sig b/marble-21.07.90.tar.xz.sig deleted file mode 100644 index 328ec45..0000000 --- a/marble-21.07.90.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEDnasACgkQu0YzUNbv -Me+YFw//VQut9kBo1N3ZNgL8Mqtn8KwXSEnQxAbevpWwnJk5dFxo33SVmHwlmkYL -0aPkOpISnHPef0M9IftUdkhKA2v+bdZbTK7Lt+HxyVimjoTaxTMhQPXptGyLeePN -ahLBVmvpAbNJ0GbuRJ62QMwPG4TNHkcZam7c6k5BEosabZEynVCKIRKr9Vmz5JCV -+ekP9dG8mUd0vRSAWq45biujd+ll1x7oDGUgsXIK1zSSEYKxHt2rIqftFb3MupZZ -UYt8tsRefPiG5r3zy5L8cjaP18AkW0aOnfDIPIo4OJ9UGY0buxnf4MLIWzrPZ8+7 -Cnnj8iuN1giEatuH4v1rMBReJlC4CQYQzyM2iUFTKFS/LYlO57MoUMhz/hvoRfW5 -1wybllNJGgeat7iHFGoi2pSMUbQYw2UOrtpraXVxTTvFRlB4JF6dZa53UVjdKCrg -F0QCfw4MMPdvKa5D712D/IH8AULHt9S5RXk0iJjKHzFQ/irjl2mnJyR+aYQeyv/W -5H9sl4aQ8PKoJxI/x57W3AxEHcF+9elUX2LGDN1BwltdYraZKA2GSpkgxxDGEmBD -d1i2CZKjPlX8tL5SyWhKKcSGIhtWD29QvzjsrUXolTZq6UP/D6af8RZY/GLiOL3/ -S637dGWdCs4dottwrVdezE9+zwlYUS5rkh3trPv6V9huNkiF5es= -=XbWY ------END PGP SIGNATURE----- diff --git a/marble-21.08.0.tar.xz b/marble-21.08.0.tar.xz new file mode 100644 index 0000000..4282ab8 --- /dev/null +++ b/marble-21.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f +size 52396820 diff --git a/marble-21.08.0.tar.xz.sig b/marble-21.08.0.tar.xz.sig new file mode 100644 index 0000000..bb65416 --- /dev/null +++ b/marble-21.08.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEMfrMACgkQu0YzUNbv +Me+zcA//UsPuQxUDSTbZF0JF12znGkLnA+N5qFuJ9/GxDnL5NRryTAf74ZCn9jNX +vK2ZJ6eAxkA/sfS9zTFfQv/w7eWHw5mqdIy1PygixRL//4bpnNSV7wp7/wWJ5U8g +FHWmUYtfD/bsxL6Xq6TZ6uJi/PYcTxdB6P6YtB0DJWFrOpH8hdxdBSL+S8osFJRc +z1XzXDkBGahIuYclq+60qedTyuu6URd9al+ZmybDTnMqgDkI+5eKZKbfI7W2ILUt +QnObyzs3dWFeXZ1p7nuldv27Imj2oWi3zX6X9ynJcvhJqVAuUzChAplYQU+dCqGO +fqYOOt6fsPLY/UJQdPCx40ObqlyS53ds8pUuhS7yL7eOavL20RU9Esghk6u5K+sH +XIDUhYQxNHI6ePsBo7wm/5lI1BSdm8v7dwmX3YDU7lio7bxv8hDhc2AkEsfGcsMR +c4TsrjaGr/7aGKsD3FNA+LMotUkZo2RXNGzu1T0y6axoiYxE7ASCH3ewLLtlfbbr +q2eQ/krSVdNOu3xZbPteuUil1ykc5HiWLGX+H4Rk5Hre9Z0hnG1kZZeuV3yk+1Ao +OF6VCFbRtdEvIL0PHcdjHt9Qu8cW8WAguDyKz3tv2IBDQEaNjUlqKMG8UlvMxwpU +mu78F02UVMOmDd8pET/MG8ERerj9xNfkFWQdCtirsaOBRao+UwQ= +=N+5+ +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index d4a592a..39d55df 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Aug 6 09:42:28 UTC 2021 - Christophe Giboudeaux + +- Update to 21.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.08/ +- No code change since 21.07.90 + ------------------------------------------------------------------- Fri Jul 30 10:05:52 UTC 2021 - Christophe Giboudeaux diff --git a/marble.spec b/marble.spec index c2ae32a..ac6eeb1 100644 --- a/marble.spec +++ b/marble.spec @@ -23,16 +23,16 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: marble -Version: 21.07.90 +Version: 21.08.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://apps.kde.org/marble -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 %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 BuildRequires: extra-cmake-modules From cbfbebf2681b7b413518154b153d55e1a74d521610ac45b4c330b5977f6f7b1b Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 12 Aug 2021 11:46:04 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=236 --- marble.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marble.changes b/marble.changes index 39d55df..6df0068 100644 --- a/marble.changes +++ b/marble.changes @@ -4,7 +4,7 @@ Fri Aug 6 09:42:28 UTC 2021 - Christophe Giboudeaux - Update to 21.08.0 * New feature release * For more details please see: - * https://kde.org/announcements/gear/21.08/ + * https://kde.org/announcements/gear/21.08.0 - No code change since 21.07.90 -------------------------------------------------------------------