From c9e545653b3d3a999b763a12906eccc3b80047bde1eb4cb30965035a2eeda7fd Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 28 Mar 2021 07:27:54 +0000 Subject: [PATCH] 21.04 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=225 --- marble-20.12.3.tar.xz | 3 --- marble-20.12.3.tar.xz.sig | 16 ---------------- marble-21.03.80.tar.xz | 3 +++ marble-21.03.80.tar.xz.sig | 16 ++++++++++++++++ marble.changes | 9 +++++++++ marble.spec | 14 ++++++++------ 6 files changed, 36 insertions(+), 25 deletions(-) delete mode 100644 marble-20.12.3.tar.xz delete mode 100644 marble-20.12.3.tar.xz.sig create mode 100644 marble-21.03.80.tar.xz create mode 100644 marble-21.03.80.tar.xz.sig diff --git a/marble-20.12.3.tar.xz b/marble-20.12.3.tar.xz deleted file mode 100644 index 6f6e667..0000000 --- a/marble-20.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57b1b129dd0301c124ab5f930af9dfe044cedfcd42a6b180c6cf3c594fba7bc2 -size 52242116 diff --git a/marble-20.12.3.tar.xz.sig b/marble-20.12.3.tar.xz.sig deleted file mode 100644 index 3acb4bc..0000000 --- a/marble-20.12.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEcACgkQu0YzUNbv -Me/zOA/9HdH3qgTR843zoHYxk9/HkxEt2cwiGz0oE+wMg4ApeTLusQ6zAxS2fs4N -+fvWl7RVspd/BffIILI91OwC7ML8PRWbf+Y3pLxI2dxg7P522VAB2bJcWScN71rD -O42CMK4tzRp7D42fi4kM+ntx2ITm8HhmuPkMK4RfYcW0e/kg/WWI46HClMUleHdL -HBrzqEVLaqzVuhShGxtabxkjjCG6fiPRn6Hw9b6jjnNbGWYryFJw0WBrWkXBKDlh -d1r5+gRKVxqtUkdSPrV42FZWuatuYLM5RcWHbL3AlK7xrCi2sNOdYUIP0CKZYC5V -utEErL6uD5lGQbHuWHpGo9HTf/De4rhjbjqd++KTCOI9s6dZ2It/38Inm3SpTNiR -G1s1FAVjGAq8kq8mPqInYTku8KZm2Npvu5M4dGeCeNjFGSGUoZbJQG0tW7XW85rf -bKN3WI/RDz6T/wenXgQQgTiIJSHJ3msO9qu3e8e2F1qAShiL2AMCJcY7y9tZGn78 -Z8Hx/y4JJVmRKzl1ttnuL6US+8rFeMDtC+iFBkm0G0OcomBbFI7Nd99vV3qQRga+ -ShlFY91iVUwTgkhnaP4UrHiztIi1d6L0SQw60J454rcRpx1QGOTHMhHscqqJgkpp -HUCwfwUfs7SMMb+6rALXDITQ68ys97Gy0xyXL1l/FMng34SYtFg= -=F7xy ------END PGP SIGNATURE----- diff --git a/marble-21.03.80.tar.xz b/marble-21.03.80.tar.xz new file mode 100644 index 0000000..5b4c518 --- /dev/null +++ b/marble-21.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bab7b989fec0ba285989129c498f52cef811dbf94c8984cb5c447306be0708b +size 52376456 diff --git a/marble-21.03.80.tar.xz.sig b/marble-21.03.80.tar.xz.sig new file mode 100644 index 0000000..e7029f2 --- /dev/null +++ b/marble-21.03.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmBXHuEACgkQOmpNuDnq +pte3vA//f366OXtGClEkqJflQTp9cutEA3vQSoO4pusgO2Fb74THyHq9uK/KG4ky +xz2Bk0l+m5UaXC+QnUaEYOd+x2TJngDMg143fbUo/O6RJ+CHbxTuCpzUTQwBqvCw +AmenJGGdT/SOgUCYS/HqO8glVwCs5ZDkk9DHvre0GC6lc86GH3Il09ObU6EzsnKc +sOIBVVTwqjVVyi8jdP+dkBXdN46HJSLW1ouS4jXYW1xkk02Oy7R/8R59VD8f70nc +d4RzkOx8jJBBhqLw8oiP1I07e7JQtYp3SVd63VEzjxvj6gZGWWpJUHxCO0+30mgg +Ng2GC2K+RY2GwsNlVtdCpqCdRoJ1kphHJf/Lc4YFQyqBQLwk4lkTa4bzA6tTh4qM +QhSeAPKMpoftZOzWw9S81BS0t+087lDsuimcc7JrYC1JixDfaxaEbp8o2z9zoPLr +M7SPvGFLGVfTeiSxk413zvYD+7dAoibuUOiCw45a7Ugf+qynqkFA+61f+2y+2og8 +YF/R75+HW71WHRgOj20sgKmViWvdvThFgX1Xxu/sW2k1Yb0V2PsrSQZ9JQK1UWiW +1/2TbypI6ze0UzWNzQQfmJ+gRG1u4a5/GMiV9pxSxxgl0N0pQsORuyE+OSWeNRMH +qSH7H8WyLQXsx3/O+7r6hOuhHdPXCwuoj0L9wrFdmWsTdabuZqc= +=ppON +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index ec5bed2..ea57d3d 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Mar 21 13:29:43 UTC 2021 - Christophe Giboudeaux + +- Update to 21.03.80 + * New feature release +- Too many changes since 20.12.3, only listing bugfixes: + * Fix GeoNames web service URL, is now api.geonames.org (kde#432598) + * Properly center GeoPainter::regionFromRect (kde#431466) + ------------------------------------------------------------------- Thu Mar 4 06:11:51 UTC 2021 - Luca Beltrame diff --git a/marble.spec b/marble.spec index 679ce3e..3dbca7c 100644 --- a/marble.spec +++ b/marble.spec @@ -1,7 +1,7 @@ # # spec file for package marble # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,14 +23,14 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: marble -Version: 20.12.3 +Version: 21.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 +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 @@ -172,7 +172,7 @@ export SUSE_ASNEEDED=0 %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%cmake_kf5 -d build -- -DBUILD_MARBLE_TESTS=NO -DMOBILE=FALSE -DQT_PLUGINS_DIR=%{_kf5_plugindir} +%cmake_kf5 -d build -- -DBUILD_MARBLE_TESTS=NO -DMOBILE=OFF -DQT_PLUGINS_DIR=%{_kf5_plugindir} %cmake_build %install @@ -208,7 +208,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_kf5_libdir}/marble/ %{_kf5_plugindir}/designer/ %{_kf5_plugindir}/libmarble*so -%{_kf5_plugindir}/plasma_runner_marble.so +%dir %{_kf5_plugindir}/kf5/ +%dir %{_kf5_plugindir}/kf5/krunner/ +%{_kf5_plugindir}/kf5/krunner/plasma_runner_marble.so %{_kf5_plugindir}/marblethumbnail.so %{_kf5_qmldir}/org/kde/marble/ %{_kf5_servicesdir}/*desktop