diff --git a/applications.keyring b/applications.keyring index 9b6ab5c..2998088 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/marble-23.08.4.tar.xz b/marble-23.08.4.tar.xz deleted file mode 100644 index 70b25a9..0000000 --- a/marble-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf2955b8cced2f09923c362346bc5d6b0aa318adda65105fe7c438c7becb7a8f -size 53784524 diff --git a/marble-23.08.4.tar.xz.sig b/marble-23.08.4.tar.xz.sig deleted file mode 100644 index 8da4ea6..0000000 --- a/marble-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIyBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7pQACgkQu0YzUNbv -Me/B1A/3d+1HKPW8LZ3VToSBlSG0cwatzTOvx2PPy6nko1kdYle3RVkgL5st5HUw -56vBNEIiM9kJrYXNQRvx/3ndsFsRi64DLJWw6gRbweD7sjYQl40+2zWvOMZ36Ik2 -TI27Ur56D2GstebSgBg737qlNkH7HRV8qbAtDuT0mNR1Ujq5ncnWrbTclUPXYPwV -uOEcthj8nMCR+c9y80/VTcr4pXL0TWV+CHTj/daZ4taDqRq4H08Lnfch/bWkkdcI -GFjOzeFhW/epu4kx9kWfQooDgj6d8xpuZpzmUjDe5dnDXmjBG0+FKbhdY0uYNJYB -oJDmiDVqdjsIO5MflQg/HKcqf9wz3/Fdl2NP5dZQonqUW6CTZN4jS9G03gIB30mj -Wi77Y2Es6YoQZRFJAZp6Rb9aMdPPmyRG6FVHd3/XGP+wtikIic7UqvXiQoaM8NpJ -ONYPg45sHtsF0hbslF2U/Jr6oSTDaYd/iE5dQ/1Yom9A+bKGofYj61JgW+eNbtMG -QhMjvQ5cC3fiXkyyMckD5oNmmBnNUZP04+qizNC2mQDeRXt2F/B3SW3ByDwbIFN0 -lMObGzNH2sNCCkC1FVbUp5XMtkocWChQo4LnPO2PdROUafAaUswv/Ii9xdArYVLU -hTUA5DN/LwKia75EJcDYcNGcMjQIrBlrby27AKLE9vrEqaBo+Q== -=VPR5 ------END PGP SIGNATURE----- diff --git a/marble-24.02.0.tar.xz b/marble-24.02.0.tar.xz new file mode 100644 index 0000000..7735138 --- /dev/null +++ b/marble-24.02.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9299073ca61724350f3236c9916ea81d4bd445009ec65b736660a4bf016ef96a +size 53833404 diff --git a/marble-24.02.0.tar.xz.sig b/marble-24.02.0.tar.xz.sig new file mode 100644 index 0000000..b232d94 --- /dev/null +++ b/marble-24.02.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVq78ACgkQu0YzUNbv +Me+r9g/9F1oJ6o8DfJubPfuy8kUyCB8Yfb5Gij/rz00qE59LiuX9FC+n/9WwiJ3y +uuj8xRu0aH9aouklQw3Ry3fzzCLC3e+A0pAQoLMZenqCh6QV3WbgaP/21Vxax/E7 +q1hs39sp/0ebBYvyZmeY8UwS4asi8SIcRP0l88PA7ZGdbmOWlvwQUQoUGbWSVyXb +srXWf2mgqQYeiv0TY3H0N5MO2qdriYa5rqGy+hG3HIf/PeblTFN60Pl79smuz27a +hBffOJ62Hquu3/QghcKdsJQKWJGCsl5wQ4WzRRcv5DaRd6Od8muLH0V+C+BxQF1l +W5VUEwCAEsTwhTYUO/9aoeGV6/GHv2owgEV2deGzzJV3QQcNTd9yN/pTpOabvTXg +e23VGRP8bCvjUe+p9Axm5OIBq5IF6luGX8/0znoEQyjDKtw0SJJNls2Py0PsLfSg +LcKuGDSYWwZlauL+XzKxAGLE5lhGdIpS6GIoZJxYAAIaumXVnFnLOOGpwRlqYmvx +XFIGKT+YolTa3/XKDY/B0O5psEYnH+58ymPHqXb92WVFIM0GPhw9cU9QDv61iMrb +Fk0vRtH37K8H+zfU3oQcGlkTDvv/P5Af/PQx8dl4Iuk8E8ZMEUHS3fXdgrADyFPZ +zbgU2r5zF74mhx+DwUo5yQPpAk3P3bNdxF4ZYGfhj8DV48rlUyg= +=SrIz +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index 98909d7..5711418 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Mar 1 20:23:17 UTC 2024 - Christophe Marin + +- Build marble with GCC 13 on Leap 15 + +------------------------------------------------------------------- +Fri Feb 23 14:00:47 UTC 2024 - Christophe Marin + +- Update to 24.02.0 + * New feature release +- Changes since 24.01.95: + * Normalize polygon winding order for 3D buildings + +------------------------------------------------------------------- +Fri Feb 9 16:09:56 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:31 UTC 2023 - Christophe Marin diff --git a/marble.spec b/marble.spec index 0f2ca10..dd38fb1 100644 --- a/marble.spec +++ b/marble.spec @@ -1,7 +1,7 @@ # # spec file for package marble # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,19 +20,23 @@ %define _so_astro 1 %bcond_without released Name: marble -Version: 23.08.4 +Version: 24.02.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 URL: https://apps.kde.org/marble -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: %{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif BuildRequires: extra-cmake-modules BuildRequires: fdupes +%if 0%{?suse_version} == 1500 +BuildRequires: gcc13-c++ +BuildRequires: gcc13-PIE +%endif BuildRequires: libqt5-qtlocation-devel BuildRequires: libshp-devel BuildRequires: perl @@ -160,9 +164,14 @@ The astronomy library for the satellites plugin. %build export SUSE_ASNEEDED=0 -%ifarch ppc ppc64 -export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" +%if 0%{?suse_version} == 1500 + export CXX=g++-13 %endif + +%ifarch ppc ppc64 + export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" +%endif + %cmake_kf5 -d build -- -DBUILD_MARBLE_TESTS=NO -DMOBILE=OFF -DQT_PLUGINS_DIR=%{_kf5_plugindir} %cmake_build @@ -194,6 +203,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_kf5_appstreamdir}/org.kde.plasma.worldclock.appdata.xml %{_kf5_appstreamdir}/org.kde.plasma.worldmap.appdata.xml %{_kf5_configkcfgdir}/marble.kcfg +%{_kf5_debugdir}/marble.categories %{_kf5_iconsdir}/hicolor/*/apps/marble.* %{_kf5_kxmlguidir}/marble/ %{_kf5_libdir}/libmarbledeclarative.so