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.04.0.tar.xz b/marble-21.04.0.tar.xz new file mode 100644 index 0000000..3b755f5 --- /dev/null +++ b/marble-21.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:187efcf9976f7e478a5420f5c4fd7ca73782b9bff58626e37e78c2efcae9c3b0 +size 52373900 diff --git a/marble-21.04.0.tar.xz.sig b/marble-21.04.0.tar.xz.sig new file mode 100644 index 0000000..dc11e26 --- /dev/null +++ b/marble-21.04.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwkACgkQu0YzUNbv +Me8BCw/+OMor5CMsRZxk0D2mg0eAQl3kd6LOKlOxKMuWLw2wggS6VLVKvMrSmM6V +9Biy29ubULRqLLIlGvppVi8J8tKOmcgqTmkP/h1xQAT4ro2p1XAvMyDSn9O2ij9d +0xzersVV92uuoJl3Zr6UKACG8Vt4aOkc+80mhMCYHGk7De5MSB1rlVMQWbFogUbn +9qZ732LYirLVFaGwshvVMbzyWq1qwGbCAGs2qGOjarNs+pKV0+ir8tjbyVQ2uAJf +SE5fN4RWjCCadPImfqhSJQtCq42WeUTwpBKDo13DlhpgFUEV8z0UafzpAmxVG00/ +WXtk+0bW7WPnXQ+vEtpyy2Do4EZyu4PmP7KUT1IdgFGqisuLeMbNZ0PpHi/YxN9Q +30dazrbBIiBgOCZ2maLLlnS6xj8wI1zKXdv6Yxb+h3GbKYg7+RNdAo6W65INCmz4 +0Ut9V3DiGYD6aOZAHdBTKR1PVp4kRzNXoatTI454hkpgxEYLsDSCIrVQR++f1Ep0 +h1dmrFkVUobKOc5XJrIdXYBK//KbciJXdDKfhk4s5Y0UNjvwGIMIlpy/dkduymTK +CJAp4wKWHYc7i4m+beVcpV4fcpF5RibwTym715p0EBUORKFsiFP+Q8JyxkGeL9Yf +tj+gpL4atYP6IednNqUj+ekTGcgiZ7fMg4wm2g94hiFjBYYcVyQ= +=2u3l +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index ec5bed2..9a28ef8 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Fri Apr 16 16:13:15 UTC 2021 - Christophe Giboudeaux + +- Update to 21.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.04 +- No code change since 21.03.90 +- Stop owning directories provided by the filesystem package (boo#1184786) + +------------------------------------------------------------------- +Fri Apr 9 17:41:40 UTC 2021 - Christophe Giboudeaux + +- Update to 21.03.90 + * New feature release +- No code change since 21.03.80 + +------------------------------------------------------------------- +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..8f368ce 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,18 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: marble -Version: 20.12.3 +Version: 21.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 +URL: https://apps.kde.org/marble 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 @@ -74,10 +78,6 @@ 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) @@ -165,14 +165,14 @@ The astronomy library for the satellites plugin. %lang_package %prep -%setup -q -n marble-%{version} +%autosetup -p1 -n marble-%{version} %build 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 @@ -193,6 +193,8 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %doc CREDITS ChangeLog MANIFESTO.txt %{_kf5_knsrcfilesdir}/marble.knsrc %exclude %{_datadir}/marble/data +%dir %{_kf5_plugindir}/kf5/ +%dir %{_kf5_plugindir}/kf5/krunner/ %{_kf5_applicationsdir}/marble_geo.desktop %{_kf5_applicationsdir}/marble_geojson.desktop %{_kf5_applicationsdir}/marble_gpx.desktop @@ -200,15 +202,17 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_kf5_applicationsdir}/marble_kmz.desktop %{_kf5_applicationsdir}/marble_shp.desktop %{_kf5_applicationsdir}/marble_worldwind.desktop -%{_kf5_appstreamdir}/ -%{_kf5_configkcfgdir}/ +%{_kf5_appstreamdir}/org.kde.marble.appdata.xml +%{_kf5_appstreamdir}/org.kde.plasma.worldclock.appdata.xml +%{_kf5_appstreamdir}/org.kde.plasma.worldmap.appdata.xml +%{_kf5_configkcfgdir}/marble.kcfg %{_kf5_iconsdir}/hicolor/*/apps/marble.* %{_kf5_kxmlguidir}/marble/ %{_kf5_libdir}/libmarbledeclarative.so %{_kf5_libdir}/marble/ %{_kf5_plugindir}/designer/ +%{_kf5_plugindir}/kf5/krunner/plasma_runner_marble.so %{_kf5_plugindir}/libmarble*so -%{_kf5_plugindir}/plasma_runner_marble.so %{_kf5_plugindir}/marblethumbnail.so %{_kf5_qmldir}/org/kde/marble/ %{_kf5_servicesdir}/*desktop