From d1661a1a779650604cadbb972c62694c3a59acb83190ff076a9eca63f31bd51e Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Mon, 20 Mar 2023 08:52:29 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=268 --- marble-22.12.3.tar.xz | 3 --- marble-22.12.3.tar.xz.sig | 16 ---------------- marble-23.03.80.tar.xz | 3 +++ marble-23.03.80.tar.xz.sig | 16 ++++++++++++++++ marble.changes | 6 ++++++ marble.spec | 16 ++++++++-------- 6 files changed, 33 insertions(+), 27 deletions(-) delete mode 100644 marble-22.12.3.tar.xz delete mode 100644 marble-22.12.3.tar.xz.sig create mode 100644 marble-23.03.80.tar.xz create mode 100644 marble-23.03.80.tar.xz.sig diff --git a/marble-22.12.3.tar.xz b/marble-22.12.3.tar.xz deleted file mode 100644 index 2c1845c..0000000 --- a/marble-22.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88511d31b17bcbc389c7aabbf0ca64bfa01239c0d5763f2877c8c75837968d71 -size 53752524 diff --git a/marble-22.12.3.tar.xz.sig b/marble-22.12.3.tar.xz.sig deleted file mode 100644 index b24a14c..0000000 --- a/marble-22.12.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmP9RVMACgkQu0YzUNbv -Me8ZmA//Td0WHsGzIRJeEOKsar1pDJYznAoAu2YkzQUG3WCaSHbcwRK26tqA1Eno -Xp9OEmfIgo3zCLtpeUEa9oxUNbsRFkcsS/kIYdD53E5iKZgR5YJ6vJkgIgP416Rq -x9NxgiYXRmrabLubQSE3pY7l0y/Hh/VX+0gXkfsJMAH8VNwIvhsvVVDY042ZHCG1 -2CJ7+mP6LN64lv/zJNKfgaRe9U1XWUr9rsjxkEAfMhTnq02oHWWh5aNkFdHkAi4R -CLFq9LFPSURP2nnWhYNMxOgTh+L5qO9hGin4zXOGtK1SaN1WC7hP9yE9yolTeAe6 -z56SKNzI/9CGrNoo4+kz/AzXGa9yiFzxx8kYitYPzhPeY3UO0WNxepiCoEbp9cBb -0ufnGgsyfOOWxP5ouDEXZ4wR/oulPd1M4RYB/vrKIMORVZAUd5znvyI8T0h4+mZC -TqxvLdtnU65t8KUmxc/6Tlh+fbQFjLDVPaqAarmvLlwndZ0JjuhbdWeDuNOURadz -YqP2FKL2BPcxRwC8cS8gq+hSBXqPe2GqnHJByvTaP7xaaba4tK7+32vfMC18tf3J -Xdl6iZ4h3y/VhEq4nDeKqQcGGJms6bYDxiyLxAWV8FO9F0e7ghw0EGf+oY63BIJc -RxO33tlxfSWWAwK0MA+fCvXJJzp5/DJOipiTC8hcYO5Np0JK1qU= -=XTU+ ------END PGP SIGNATURE----- diff --git a/marble-23.03.80.tar.xz b/marble-23.03.80.tar.xz new file mode 100644 index 0000000..3c4393f --- /dev/null +++ b/marble-23.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e705ad650dbdcc4324108b5f0929c7f56b74d775646d0ea853ba3b16c581f61 +size 53760288 diff --git a/marble-23.03.80.tar.xz.sig b/marble-23.03.80.tar.xz.sig new file mode 100644 index 0000000..5c2a447 --- /dev/null +++ b/marble-23.03.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmQUGvcACgkQOmpNuDnq +ptfo/A/+JXzVCxGEWV2Sg82L2nUPdRHq3VOH95PU2GMyskTzujOjBHT+OMch8JJr +3eIXrbLjx2tgZAn+8KTBhd4ndsz4ccP9TgZM5r6DwOkRxmnB+4vi7JbFZ7uRN0sX +ivZQ883Qdv3iFfXc2yf0AIDXH/DgfTLlKxksDdcDySx9xtMOwtSdHv0W1u5E1toP +H3Z2n7jfq8Ldm7apV6tpKmP3YyjNekOG53OYZgHjGMoI9xzl5GL30CXXgDrXhScr +JxnJdL93Lo6etAj5LrCkcWAE0FD7wdINkNEzDeejBNeMtKPawOFgRgdws4WZ70oy +kmeBxuEfBCx/ali+UBfuodYvBm1Tk7wdPyaZs9d1fM4xDsxyceLVqRSO7aLkeJ22 +2p8aDnWTI1Ayt5SkV5XzkgV+Gb3PoOw8Zfi8eJYggMvWjfZ+KRjlloLbzG2hcw8Z +4rJ9AUv80aWmq73Pb5WAKDlIQoLTVYnZc4nfT181/3ZorQDaPpG3huyr4dhI17zn +PBsKN5E3U18ny6X2doE0f3v22b4dkEcjRwcjjhZsYYuwOVwDSTqUwx5T5tCirTKI +OTPy89/SQ9lxzr1ofjhfKJbbNttOHNWv8CV/Lc+wIgEqVFpHIrc6dT2c3/WKBDN9 +8RSFjjsegpI2RJEAtcKdrkEOEY5MYTergBcbCUhpnf0gk6L4z/E= +=C8qf +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index 52227ec..1157f82 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 17 20:44:28 UTC 2023 - Christophe Marin + +- Update to 23.03.80 + * New feature release + ------------------------------------------------------------------- Tue Feb 28 09:46:55 UTC 2023 - Christophe Marin diff --git a/marble.spec b/marble.spec index 53577f0..ed29cab 100644 --- a/marble.spec +++ b/marble.spec @@ -18,19 +18,17 @@ %define _so -28 %define _so_astro 1 -# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) -%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: marble -Version: 22.12.3 +Version: 23.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 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 @@ -40,6 +38,7 @@ BuildRequires: kf5-filesystem BuildRequires: libqt5-qtlocation-devel BuildRequires: libshp-devel BuildRequires: perl +BuildRequires: pkgconfig BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5Crash) @@ -68,6 +67,7 @@ BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) +BuildRequires: pkgconfig(protobuf) Requires: %{name}-data = %{version} Requires: libastro%{_so_astro} = %{version} Requires: libmarblewidget-qt5%{_so} = %{version} @@ -75,11 +75,12 @@ Requires: marble-frontend = %{version} Recommends: %{name}-doc = %{version} Obsoletes: marble5 < %{version} Provides: marble5 < %{version} -%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 +%ifarch %{ix86} x86_64 %{arm} aarch64 # Only include WebEngine on platforms where it is available BuildRequires: cmake(Qt5WebEngineWidgets) %endif + %description Marble is a viewer of map data. @@ -120,7 +121,7 @@ Requires: cmake(Qt5Widgets) Requires: cmake(Qt5Xml) Obsoletes: marble5-devel < %{version} Provides: marble5-devel = %{version} -%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 +%ifarch %{ix86} x86_64 %{arm} aarch64 Requires: cmake(Qt5WebEngineWidgets) %endif @@ -179,7 +180,6 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %files %license COPYING* LICENSE* %doc CREDITS ChangeLog MANIFESTO.txt -%{_kf5_knsrcfilesdir}/marble.knsrc %exclude %{_datadir}/marble/data %dir %{_kf5_plugindir}/kf5/ %dir %{_kf5_plugindir}/kf5/krunner/