From 032fcd7005174fdc78f718c66d2ac11ac9349629598c99d2f45381003e0f96bb Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 17 Nov 2022 22:58:55 +0000 Subject: [PATCH] KDE release gear 22.12 beta. Don't forward OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=262 --- marble-22.08.3.tar.xz | 3 --- marble-22.08.3.tar.xz.sig | 16 ---------------- marble-22.11.80.tar.xz | 3 +++ marble-22.11.80.tar.xz.sig | 16 ++++++++++++++++ marble.changes | 6 ++++++ marble.spec | 30 ++++++++++-------------------- 6 files changed, 35 insertions(+), 39 deletions(-) delete mode 100644 marble-22.08.3.tar.xz delete mode 100644 marble-22.08.3.tar.xz.sig create mode 100644 marble-22.11.80.tar.xz create mode 100644 marble-22.11.80.tar.xz.sig diff --git a/marble-22.08.3.tar.xz b/marble-22.08.3.tar.xz deleted file mode 100644 index 7df6e58..0000000 --- a/marble-22.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b7777fda9401e41b6340ffb56b4a7e6fd27996a71684b29c6d4ebfe4baaf60b -size 53675664 diff --git a/marble-22.08.3.tar.xz.sig b/marble-22.08.3.tar.xz.sig deleted file mode 100644 index 797c615..0000000 --- a/marble-22.08.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmNgYo0ACgkQu0YzUNbv -Me9fyw//UtYibtf0va3U83N26aEMebaXWGlySdS5ht4vEeJq199ZIHWavP69WXJw -q2+UIHANMYaJ+nftwKzxpbgnTjMnlkCC8aMhtA3GvThg1cMR4Hv/nx52lNSToQAG -Mn8ohYILv5I356W35vAk9Qyu193g0VOWHASLpnbYmz9DXOiXx7EICc7usWwiNkN4 -E7KQWm2/93oXc57UamiaqGnRrHm99aKmjtcYkjG0xigh52bicccY4BJdiMdq3lYA -puPd5T/xv4GEr0Yi2wf5ldgRn/tzVC1ifVx8ANkAZklX7uBQj+8qiRD0yybl586j -/oCfc38M26ObqG9z+AKxJ/7HokXCApKNJXzgqv80wc0nCkowo3FNnmEY80/wVKCn -RQo9Lrl5kYSqHP81bNxvRdtjG0yvwUAOlXCJZDtrR38UI1awoqckOfsOdzzSH3g8 -7VtWXhZVL3Sq9PmKg/ZuWuB4vJwvxxNgtSkSPERtTkVf7RuuXfGRq1rDdqs/3qz5 -1sZJFzkfKYPnI/FAxaAR+A+H0W8FEHDzdkr9xXBVgty2YB9fX4tL+3uiigyzWiDk -TvH3d4pjg5uvgHFN9C6l+L7UwAL6zfKMXM7PuQkq5/iuQ0L9iwY44CeWIw8cZ/gv -shAB5OYEHpg7HSon7bdneyY4vzINpM0J2iYO3jtSH9BOcA4jUYI= -=kRM4 ------END PGP SIGNATURE----- diff --git a/marble-22.11.80.tar.xz b/marble-22.11.80.tar.xz new file mode 100644 index 0000000..9cc48f5 --- /dev/null +++ b/marble-22.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9e373bfd19c4d4764d4cbb25ca1bd647c44914dee6bf06e88f343a18c211935 +size 53747844 diff --git a/marble-22.11.80.tar.xz.sig b/marble-22.11.80.tar.xz.sig new file mode 100644 index 0000000..8d8e38d --- /dev/null +++ b/marble-22.11.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmNtkT4ACgkQOmpNuDnq +ptcReA//bw9OPgJAGIVR9e0JAuMffdnr8UnaSsMRp8BHBiqCvVtcwBIQ54ZSSVcz +XjeYqHui3YfUvYct0N5N3vmAiUr2zsF97coUTRTXWLO+apat29JckaofjpYS7wEK +767klQcDX7p9zsnLFGBgHl6yK/AtSQWlpHpm64xFRXt9hSZOgWpdesQe2cuBa8uL +H0KSG1QO/gWtPo1X0m0dPTw4nuX3x7BrvYJeXFnkOX1mxNaUdf/aHniZWoXwIqHL ++MgX1Oh9JjaqLZiCOlR+hqHIBEUVIMTNgde7NbcSf33QHzsIl6KsJwQtqCYLIlOp +DZqp+QP/mMO+DWnoSf+HcZDwCu1C8Acp+TNgu9k8LbkysTWKqzsTbRoyUTMgRSxt +B6hxbbA9qyIB4C9c/Pn3NR7UEvTl42oPTeyvACpemKYMrihdoFv+cX8/RyTxr44n +0wHqtTdpSVpD2gajn6Zz/8YW6Lgrx/GyAUvQve/oHXUWkMYIRJ4l88ohewVvnDNl +BOx+aiNNnM6ZdlsXUir76gozJN8EAg0opUg51vz387yxG2gQdyXa9ffGPUpnLDOe +vi3i+G4AH7xbpQdhJj9JP5cvt0y/gT4FPRuOx1DKzuVDern5ai/ws/UOPxDoairE +BFhr0qIwdpAO3f1Ee9jcV+EimlQ77ohP/tmSmWMD+CT2+dGoeWA= +=qFru +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index 6db32aa..d9ee4b1 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 12 08:55:20 UTC 2022 - Christophe Giboudeaux + +- Update to 22.11.80 + * New feature release + ------------------------------------------------------------------- Tue Nov 1 11:21:40 UTC 2022 - Christophe Giboudeaux diff --git a/marble.spec b/marble.spec index a1b3bdd..b88f4bd 100644 --- a/marble.spec +++ b/marble.spec @@ -1,7 +1,7 @@ # # spec file for package marble # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,16 +22,15 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: marble -Version: 22.08.3 +Version: 22.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://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 released} -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 @@ -86,7 +85,6 @@ Marble is a viewer of map data. %package qt Summary: Qt Frontend for Marble -Group: Amusements/Teaching/Other Requires: %{name} = %{version} Conflicts: marble-frontend Provides: marble-frontend = %{version} @@ -96,7 +94,6 @@ The Qt frontend for the Marble map viewer %package kde Summary: The KDE optimized frontend for Marble and several Plasmoids/Wallpapers -Group: Amusements/Teaching/Other Requires: %{name} = %{version} Supplements: (marble and plasma5-desktop) Conflicts: marble-frontend @@ -107,7 +104,6 @@ The KDE frontend for the Marble map viewer. It also includes several plasmoids a %package data Summary: Generic map viewer: data -Group: Amusements/Teaching/Other Requires: %{name} = %{version} Obsoletes: marble5-data < %{version} Provides: marble5-data < %{version} @@ -118,7 +114,6 @@ Marble is a viewer of map data. This package contains its data. %package devel Summary: Generic map viewer: Build Environment -Group: Development/Libraries/KDE Requires: libastro%{_so_astro} = %{version} Requires: libmarblewidget-qt5%{_so} = %{version} Requires: cmake(Qt5Widgets) @@ -134,7 +129,6 @@ Development headers and libraries for Marble. %package doc Summary: Marble documentation -Group: Amusements/Teaching/Other Requires: %{name} = %{version} Obsoletes: marble5-doc < %{version} Provides: marble5-doc = %{version} @@ -145,14 +139,12 @@ Marble is a viewer of map data. This package contains its documentation. %package -n libmarblewidget-qt5%{_so} Summary: Generic map viewer: Shared Library -Group: Development/Libraries/KDE %description -n libmarblewidget-qt5%{_so} The shared library for the MarbleWidget shared library. %package -n libastro%{_so_astro} Summary: Astronomy: Shared Library -Group: Development/Libraries/KDE Requires: libmarblewidget-qt5%{_so} Obsoletes: libastro-qt5-%{_so_astro} < %{version} Provides: libastro-qt5-%{_so_astro} = %{version} @@ -174,12 +166,12 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %cmake_build %install - %kf5_makeinstall -C build - %if %{with released} - %find_lang %{name} --with-man --all-name --with-qt - %{kf5_find_htmldocs} - %endif - %fdupes %{buildroot} +%kf5_makeinstall -C build + +%find_lang %{name} --with-man --all-name --with-qt +%{kf5_find_htmldocs} + +%fdupes %{buildroot} %post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig %postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig @@ -250,8 +242,6 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_datadir}/plasma/plasmoids/ %{_datadir}/plasma/wallpapers/ -%if %{with released} %files lang -f %{name}.lang -%endif %changelog