From d5a5b140c9ef2bb3e8cc96ecf65d94dc44a00896df628018af5704a7dafaf493 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 21 Nov 2020 12:58:51 +0000 Subject: [PATCH 1/3] 20.12 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=216 --- marble-20.08.3.tar.xz | 3 --- marble-20.08.3.tar.xz.sig | 11 ----------- marble-20.11.80.tar.xz | 3 +++ marble-20.11.80.tar.xz.sig | 16 ++++++++++++++++ marble.changes | 9 +++++++++ marble.spec | 9 +++++---- 6 files changed, 33 insertions(+), 18 deletions(-) delete mode 100644 marble-20.08.3.tar.xz delete mode 100644 marble-20.08.3.tar.xz.sig create mode 100644 marble-20.11.80.tar.xz create mode 100644 marble-20.11.80.tar.xz.sig diff --git a/marble-20.08.3.tar.xz b/marble-20.08.3.tar.xz deleted file mode 100644 index a4820dc..0000000 --- a/marble-20.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb3991a2395162795022ab0c09edb626229aeba06036370c98277d228e7ffdf6 -size 52191936 diff --git a/marble-20.08.3.tar.xz.sig b/marble-20.08.3.tar.xz.sig deleted file mode 100644 index 1c35926..0000000 --- a/marble-20.08.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl+gqkIACgkQ29LOiT4t -HIdH/wgAkEy0xyImvzwL/5bFWIy16lKVukCxDtScGd7afPdiG0q6eZCqbgpFjTLN -un3CSsiWoRIf/YUqJOMtXpKRSQfaCVvOAWCvk4cOMDdSmVBsw89PgCOG0HslzRCI -5Gi1kZvufaYEqLGRymnMHd5MSrNuSbHXMkrLZ0r7Q6PSSgGswfri3Qv9AR+a99Sj -HKXHajerzOlPspd1qNnJwxr6LyC8IBMI4A61Y2lcfOPF3iJsFunykY6L/+G6eeVQ -WTeaUhvzwfeY/OPP60NBg/I7e9Li81Pk5I+pn5Abq5LDxww5DWemj2wNQbzZWwia -4FdgH8wdGBpN0cND1uwd+JE2rNB8Ng== -=sRkW ------END PGP SIGNATURE----- diff --git a/marble-20.11.80.tar.xz b/marble-20.11.80.tar.xz new file mode 100644 index 0000000..25d7e86 --- /dev/null +++ b/marble-20.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:330d9d55dbe8a74e3cafb31bd6aa2988037b67f79a6d65cf31f72da0b5238dcf +size 52213212 diff --git a/marble-20.11.80.tar.xz.sig b/marble-20.11.80.tar.xz.sig new file mode 100644 index 0000000..025fd16 --- /dev/null +++ b/marble-20.11.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl+uooYACgkQOmpNuDnq +ptclUw/+NQq5/aZspoArmqcVu1f7L9/p8ukbW3XosQswOLzFq9WaZbo0gfz/ZwGU +dteBDeoOM6K2nhC0EAqLDOFKUNoK/buy8f0oYVVLwGnHVHKzSmiiAq2kXQ9bW5x2 +cMIOeG17mXDXOYIvKBmGnhR9dE1iEUk91JmLadc3PQm0OoGjZHSeWTi1eYal01Np +wmZMsnc/U23+xlapbDan7O93KSA3z5nHik7wApsyEJf2CC16b3GfI/qSuPmWimOC +kulm6J9QdO7QvdpyuMDgG59nRc0nApHynQeTINyIci4g2YXck5DQPcDloPjKFAn/ +QZ4lJ5a3+4HJETkHW3mvGlLGoBc7QpGXEb/xcJOcYUwMfixTxOb4601LCys5MG8c +ciY1kfShLSICM+GFV8P9BcRaL7faZ0WVgoctmbWYD3vnJhP9nc1fX0w5esIYPpFA +2ImtReZ1kH3tsLCjTNnfCsoPKzI5JNDRJOhz0Xoj0psJaF/GNYK+lQMOuWy1iGa/ +Y8tKZgoicAhvO3b9BAptGpPdyBQNKuVng3F5h0bQIcuvE9e5h8VsQKX+1oXRbYp8 +dumWedhiAvpWyiYdq/8FreAgNvS+b+mP5aCVcLQdvCOD/3DOC1LZupboiBprZyfi +oauUiKx62mBOfjF9VY2XhhmAVHNFBtekqmoUb0+TFgQx797fFPQ= +=fYPo +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index 5151ef5..99ee04b 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Nov 14 00:03:06 UTC 2020 - Christophe Giboudeaux + +- Update to 20.11.80 + * New feature release +- Too many changes since 20.08.3, only listing bugfixes: + * Skip creation of temporary files for zipped KML (KMZ) (kde#428437) + * Dont open a MessageBox when a file fails to load from the library (kde#416925) + ------------------------------------------------------------------- Thu Nov 5 22:47:52 UTC 2020 - Luca Beltrame diff --git a/marble.spec b/marble.spec index 64940ae..2971339 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.08.3 +Version: 20.11.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 +Source: https://download.kde.org/unstable/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/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 %ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 @@ -191,7 +191,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %files %license COPYING* LICENSE* %doc CREDITS ChangeLog MANIFESTO.txt -%config %{_kf5_configdir}/marble.knsrc +%{_kf5_knsrcfilesdir}/marble.knsrc %exclude %{_datadir}/marble/data %{_kf5_applicationsdir}/marble_geo.desktop %{_kf5_applicationsdir}/marble_geojson.desktop @@ -209,6 +209,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_kf5_plugindir}/designer/ %{_kf5_plugindir}/libmarble*so %{_kf5_plugindir}/plasma_runner_marble.so +%{_kf5_plugindir}/marblethumbnail.so %{_kf5_qmldir}/org/kde/marble/ %{_kf5_servicesdir}/*desktop %{_kf5_sharedir}/marble/ From 1df9b304207c7a3f281b873d2b7feb174ded2929710e54517ac66ef38f2f0be0 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Mon, 30 Nov 2020 11:07:32 +0000 Subject: [PATCH 2/3] 20.11.90 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=217 --- marble-20.11.80.tar.xz | 3 --- marble-20.11.80.tar.xz.sig | 16 ---------------- marble-20.11.90.tar.xz | 3 +++ marble-20.11.90.tar.xz.sig | 11 +++++++++++ marble.changes | 7 +++++++ marble.spec | 2 +- 6 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 marble-20.11.80.tar.xz delete mode 100644 marble-20.11.80.tar.xz.sig create mode 100644 marble-20.11.90.tar.xz create mode 100644 marble-20.11.90.tar.xz.sig diff --git a/marble-20.11.80.tar.xz b/marble-20.11.80.tar.xz deleted file mode 100644 index 25d7e86..0000000 --- a/marble-20.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:330d9d55dbe8a74e3cafb31bd6aa2988037b67f79a6d65cf31f72da0b5238dcf -size 52213212 diff --git a/marble-20.11.80.tar.xz.sig b/marble-20.11.80.tar.xz.sig deleted file mode 100644 index 025fd16..0000000 --- a/marble-20.11.80.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl+uooYACgkQOmpNuDnq -ptclUw/+NQq5/aZspoArmqcVu1f7L9/p8ukbW3XosQswOLzFq9WaZbo0gfz/ZwGU -dteBDeoOM6K2nhC0EAqLDOFKUNoK/buy8f0oYVVLwGnHVHKzSmiiAq2kXQ9bW5x2 -cMIOeG17mXDXOYIvKBmGnhR9dE1iEUk91JmLadc3PQm0OoGjZHSeWTi1eYal01Np -wmZMsnc/U23+xlapbDan7O93KSA3z5nHik7wApsyEJf2CC16b3GfI/qSuPmWimOC -kulm6J9QdO7QvdpyuMDgG59nRc0nApHynQeTINyIci4g2YXck5DQPcDloPjKFAn/ -QZ4lJ5a3+4HJETkHW3mvGlLGoBc7QpGXEb/xcJOcYUwMfixTxOb4601LCys5MG8c -ciY1kfShLSICM+GFV8P9BcRaL7faZ0WVgoctmbWYD3vnJhP9nc1fX0w5esIYPpFA -2ImtReZ1kH3tsLCjTNnfCsoPKzI5JNDRJOhz0Xoj0psJaF/GNYK+lQMOuWy1iGa/ -Y8tKZgoicAhvO3b9BAptGpPdyBQNKuVng3F5h0bQIcuvE9e5h8VsQKX+1oXRbYp8 -dumWedhiAvpWyiYdq/8FreAgNvS+b+mP5aCVcLQdvCOD/3DOC1LZupboiBprZyfi -oauUiKx62mBOfjF9VY2XhhmAVHNFBtekqmoUb0+TFgQx797fFPQ= -=fYPo ------END PGP SIGNATURE----- diff --git a/marble-20.11.90.tar.xz b/marble-20.11.90.tar.xz new file mode 100644 index 0000000..df6da11 --- /dev/null +++ b/marble-20.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:244b73f3c9831621e95ceadfbc0288e2e59bda54bad8ea2f540710eddedaf98b +size 52214028 diff --git a/marble-20.11.90.tar.xz.sig b/marble-20.11.90.tar.xz.sig new file mode 100644 index 0000000..81f0120 --- /dev/null +++ b/marble-20.11.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/ATtAACgkQ29LOiT4t +HIdKhwf/YA49Jr5aXd5UHDGxHrY/DdimFY+xia7YbN2qmbGa0zxuwYRs5YnRVTFF +tX+cdBZJXovpmcsEeHZVRgFZDCCGYBc2MiXhtHYh2jDyCJPykCLBUu6eM5Wncl7x +2Jj/fX2xQx1LWPRSx+0Zw8QlXOcOqTPYYCh3OI0iKvW2qrPII2ufVcpZ/prxIvnf +0ahlDBR7o8jbHrhJF50kUaiZrQ48Jodm5wRQVLlqVEp7u2jzX1ei+SVFkv7ZqArz +Wh45ZqPD0hYm2F0mXzAxv4SSqVz361hydTTW/Pd026FPKJOWwIHv/xHA0HFwHPM5 +IlG7ZFCpxMczq4t9iQmOqhWs8dX2gg== +=5CCf +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index 99ee04b..9d749e2 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 27 15:18:04 UTC 2020 - Christophe Giboudeaux + +- Update to 20.11.90 + * New feature release +- No code change since 20.11.80 + ------------------------------------------------------------------- Sat Nov 14 00:03:06 UTC 2020 - Christophe Giboudeaux diff --git a/marble.spec b/marble.spec index 2971339..4549369 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.11.80 +Version: 20.11.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 16e701a96e0925c2988187aee0b242b203b67ecaeec20fefab1c0bb0baf337ad Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 8 Dec 2020 07:26:00 +0000 Subject: [PATCH 3/3] KDE Applications 20.12.0 final: release on 10th Dec OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=218 --- marble-20.11.90.tar.xz | 3 --- marble-20.11.90.tar.xz.sig | 11 ----------- marble-20.12.0.tar.xz | 3 +++ marble-20.12.0.tar.xz.sig | 11 +++++++++++ marble.changes | 9 +++++++++ marble.spec | 6 +++--- 6 files changed, 26 insertions(+), 17 deletions(-) delete mode 100644 marble-20.11.90.tar.xz delete mode 100644 marble-20.11.90.tar.xz.sig create mode 100644 marble-20.12.0.tar.xz create mode 100644 marble-20.12.0.tar.xz.sig diff --git a/marble-20.11.90.tar.xz b/marble-20.11.90.tar.xz deleted file mode 100644 index df6da11..0000000 --- a/marble-20.11.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:244b73f3c9831621e95ceadfbc0288e2e59bda54bad8ea2f540710eddedaf98b -size 52214028 diff --git a/marble-20.11.90.tar.xz.sig b/marble-20.11.90.tar.xz.sig deleted file mode 100644 index 81f0120..0000000 --- a/marble-20.11.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/ATtAACgkQ29LOiT4t -HIdKhwf/YA49Jr5aXd5UHDGxHrY/DdimFY+xia7YbN2qmbGa0zxuwYRs5YnRVTFF -tX+cdBZJXovpmcsEeHZVRgFZDCCGYBc2MiXhtHYh2jDyCJPykCLBUu6eM5Wncl7x -2Jj/fX2xQx1LWPRSx+0Zw8QlXOcOqTPYYCh3OI0iKvW2qrPII2ufVcpZ/prxIvnf -0ahlDBR7o8jbHrhJF50kUaiZrQ48Jodm5wRQVLlqVEp7u2jzX1ei+SVFkv7ZqArz -Wh45ZqPD0hYm2F0mXzAxv4SSqVz361hydTTW/Pd026FPKJOWwIHv/xHA0HFwHPM5 -IlG7ZFCpxMczq4t9iQmOqhWs8dX2gg== -=5CCf ------END PGP SIGNATURE----- diff --git a/marble-20.12.0.tar.xz b/marble-20.12.0.tar.xz new file mode 100644 index 0000000..d9b0221 --- /dev/null +++ b/marble-20.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa5a7891a7f8d0b6b9abdcbc99fc4dc783f6b93e898b3b9fcbe69b7348c1eb85 +size 52213632 diff --git a/marble-20.12.0.tar.xz.sig b/marble-20.12.0.tar.xz.sig new file mode 100644 index 0000000..c3b1d8a --- /dev/null +++ b/marble-20.12.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/JhIsACgkQ29LOiT4t +HIf8sQf8Ck/Fmcs5HBLio361xsjy3G7qgY2av5FgL/R2fqJ1ccO6ZDpr87LX20HB +D+wmnFks37Rd9jmSQZYjMkIz99HIRZ/1k+CoP5Bm0Y280wCDHrLleuhk0HU7QM3o +JNnKP88yAkYeOuyPFSLihuKyEEvD7YWdi0+p5ZY9KESnyuePGmOy+QYGkNqtDMpo +a6TE8He933t5IcrNkdyxGFX3tbWv/RkfxgAatEDSo7Ba06CZFzdSQvl5dLeFrBbT +/D62uVlv0ij9erGMveeoNMz4orgSJ9PX98FcGfhsjts1HwBaHvF5sQnXMcuGh996 +RxT9jzl4Zh0D6cy/Hsm649gzWKQpYg== +=LUls +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index 9d749e2..e50b429 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Dec 5 23:17:51 UTC 2020 - Luca Beltrame + +- Update to 20.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-12-apps-update +- No code change since 20.11.90 + ------------------------------------------------------------------- Fri Nov 27 15:18:04 UTC 2020 - Christophe Giboudeaux diff --git a/marble.spec b/marble.spec index 4549369..95389a4 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.11.90 +Version: 20.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/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