diff --git a/marble-24.08.3.tar.xz b/marble-24.08.3.tar.xz deleted file mode 100644 index 404389a..0000000 --- a/marble-24.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c53c1faa741e1b424594c2021fa4edc620528e862ceff280cb3c952d1af20371 -size 52449740 diff --git a/marble-24.08.3.tar.xz.sig b/marble-24.08.3.tar.xz.sig deleted file mode 100644 index fda26d9..0000000 --- a/marble-24.08.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmcpYUYACgkQu0YzUNbv -Me968Q//aXKEQRDSqxNdcizZ0UxggbgkKu1n9cUEW8fzRt2ZlWn48BQh8U7X9ise -yOUMyVXGd0FCjJfhtVCgdxcqzgZzijSxwIc3e+YE/05b5yaVQnyc6U23D1OFvNYC -ub+OPeD11+U2V3fXNWp6rx77wMOAlOFi/j1lCVzl2XDnq0+nmYlgmC3mbRv0XzST -+2tOCmxBASwUwC4dUJTOb5xXy9u0OhfFHrhlMdo7madZ8M9Y5b1DH069fsgtROH/ -cWZ/KWOAP0H2ocVd1UHS+JSPyAL2phFX4d0XewSr4H/E2ZCZJprJHOll/mG7ITgL -4L2vnfOx3s45kwE48B+KwJOixeBXJ5bJCAob6rnlEdJU42gD6jenYspsF2NsbLKR -9/hp5yegNOALocM2apE2Kc/KaYnHKOK7brOrEHTDmvfx8L0lBVCboy7mZj7Y5fjv -vsN8y5ul19++Zm8rAbur+2gR9jACruhgCZEVzT1QmyIG4RMznlGZoaAbbhkWZ2di -2exeTJbnjhK4FTWIzFVjtoVKW6AaC62ixyhuWtYl0A7RAQsTm8eoWuUtavBTH24I -7aMe0GWgRvQDlpA1coVwfe0xzMDcAf9CyPYdmfib8SXIQh2Mm504PPrdq6s9cBhh -1rK/BM4+8Br191RM8ZE1AnqxlpPw32nUfRwu85aUCtN0f56wKpw= -=mUJp ------END PGP SIGNATURE----- diff --git a/marble-24.12.0.tar.xz b/marble-24.12.0.tar.xz new file mode 100644 index 0000000..3fc7b64 --- /dev/null +++ b/marble-24.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a347f134d1428bd46b886bb41a292a2fec4aea4de274bff73cd8b8994f920576 +size 53635296 diff --git a/marble-24.12.0.tar.xz.sig b/marble-24.12.0.tar.xz.sig new file mode 100644 index 0000000..a405461 --- /dev/null +++ b/marble-24.12.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmdSP+8ACgkQu0YzUNbv +Me8ipw//d4ydxu0i2fsnPdokrNufUYzEpHyrPsSeYOH7W9J2C7163tClUOrx+C9A +FOfy/dGLSbvseRz+k02H95SQ7PBKjfkgFr/KUr5pwEz5uk9YmPXyykehStfIFhAq +yFlOMxJyfNp7WYFpy3f2vOvSqsR1JPavt1++g9psKmoFCupsnKk4CjPv0DZP4yae +ht2Rcg53fI/QjPffdV9Dl01eSixm7szE4bByi4N6PYET+o3qHs97H5JD/D5/Ud9f +Bw11A/y35qsXIf5EdRYHFEFhb6AKEOUWw+6AT0gybPrIkQXUEuJhGTBeD6hKeAP5 +E3C3Ob98QX+u5dbOSfRUhqtdoo9Tf2vyNFP0WIJANhz9T1xXUGUmEjRfXWD30xOr +avngnF71ROa0JSDFtUb6635FXV4AKTVR07aV7TyyTt3cFZTirJhO+nR574EB+5tp +RU4W4Mxw7sua1WROtNkhH3trxTZKR0+Xfj/vkPlMouH/iKcTXCyimGjIv+01DS3f +msoNU3flh+nA29ilquS6Qxe+kzC3rS6xXBJEHDPGUpbPnfRRN6NHzIOHNsbInlWb +y4gjeINfDPhgF3w9ko/VTG5etxvceoTFdd0NElKwTmHtUlMJoF1SmwfMtBg042S4 +voAdLqOHKjTTlu5z0zX7LVY1KCY0OEwJlxqoR3HiT1N6PGkJsXs= +=aVNm +-----END PGP SIGNATURE----- diff --git a/marble.changes b/marble.changes index 6059b1f..9d8262c 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sun Dec 8 09:28:26 UTC 2024 - Christophe Marin + +- Update to 24.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/24.12.0/ +- No code change since 24.11.90 + +------------------------------------------------------------------- +Mon Dec 2 08:43:56 UTC 2024 - Christophe Marin + +- Update to 24.11.90 + * New feature release +- Changes since 24.11.80: + * behaim: fix Exec in desktop file + +------------------------------------------------------------------- +Sat Nov 16 17:30:37 UTC 2024 - Christophe Marin + +- Update to 24.11.80 + * New feature release +- Too many changes to list here. + ------------------------------------------------------------------- Tue Nov 5 10:44:10 UTC 2024 - Christophe Marin diff --git a/marble.spec b/marble.spec index 056a9db..c7758b6 100644 --- a/marble.spec +++ b/marble.spec @@ -18,9 +18,17 @@ %define _so -28 %define _so_astro 1 + +%define kf6_version 6.6.0 +%define qt6_version 6.6.0 + +%ifarch x86_64 aarch64 riscv64 +%define with_webengine 1 +%endif + %bcond_without released Name: marble -Version: 24.08.3 +Version: 24.12.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 @@ -31,66 +39,62 @@ Source0: https://download.kde.org/stable/release-service/%{version}/src/% 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 -%if 0%{?suse_version} == 1500 -BuildRequires: gcc13-c++ -BuildRequires: gcc13-PIE -%endif -BuildRequires: libqt5-qtlocation-devel -BuildRequires: libshp-devel +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: perl BuildRequires: pkgconfig -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5Parts) -BuildRequires: cmake(KF5Plasma) -BuildRequires: cmake(KF5Runner) -BuildRequires: cmake(KF5Service) -BuildRequires: cmake(KF5Wallet) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(Phonon4Qt5) -BuildRequires: cmake(Qt5Concurrent) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Designer) -BuildRequires: cmake(Qt5Network) -BuildRequires: cmake(Qt5OpenGL) -BuildRequires: cmake(Qt5PrintSupport) -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5Script) -BuildRequires: cmake(Qt5SerialPort) -BuildRequires: cmake(Qt5Sql) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) -BuildRequires: cmake(Qt5Xml) -BuildRequires: pkgconfig(Qgpsmm) +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6Crash) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6Parts) >= %{kf6_version} +BuildRequires: cmake(KF6Runner) >= %{kf6_version} +BuildRequires: cmake(Phonon4Qt6) +BuildRequires: cmake(Plasma) >= 6.0.0 +BuildRequires: cmake(Qt6Concurrent) >= %{qt6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version} +BuildRequires: cmake(Qt6DBus) >= %{qt6_version} +BuildRequires: cmake(Qt6Designer) >= %{qt6_version} +BuildRequires: cmake(Qt6LinguistTools) >= %{qt6_version} +BuildRequires: cmake(Qt6Network) >= %{qt6_version} +BuildRequires: cmake(Qt6Positioning) >= %{qt6_version} +BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version} +BuildRequires: cmake(Qt6Quick) >= %{qt6_version} +BuildRequires: cmake(Qt6SerialPort) >= %{qt6_version} +BuildRequires: cmake(Qt6Sql) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6SvgWidgets) >= %{qt6_version} +BuildRequires: cmake(Qt6WebChannel) >= %{qt6_version} +%if 0%{?with_webengine} +# Only include WebEngine on platforms where it is available +BuildRequires: cmake(Qt6WebEngineQuick) >= %{qt6_version} +BuildRequires: cmake(Qt6WebEngineWidgets) >= %{qt6_version} +%endif +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +BuildRequires: cmake(Qt6Xml) >= %{qt6_version} +BuildRequires: cmake(absl) BuildRequires: pkgconfig(libgps) BuildRequires: pkgconfig(protobuf) -Requires: %{name}-data = %{version} +BuildRequires: pkgconfig(Qgpsmm) +BuildRequires: pkgconfig(shapelib) +BuildRequires: pkgconfig(zlib) Requires: libastro%{_so_astro} = %{version} -Requires: libmarblewidget-qt5%{_so} = %{version} +Requires: libmarblewidget-qt6%{_so} = %{version} +Requires: marble-data = %{version} Requires: marble-frontend = %{version} -Recommends: %{name}-doc = %{version} +Recommends: marble-doc = %{version} Obsoletes: marble5 < %{version} Provides: marble5 < %{version} -%ifarch %{ix86} x86_64 %{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. %package qt Summary: Qt Frontend for Marble -Requires: %{name} = %{version} +Requires: marble = %{version} Conflicts: marble-frontend Provides: marble-frontend = %{version} @@ -99,8 +103,8 @@ The Qt frontend for the Marble map viewer %package kde Summary: The KDE optimized frontend for Marble and several Plasmoids/Wallpapers -Requires: %{name} = %{version} -Supplements: (marble and plasma5-desktop) +Requires: marble = %{version} +Supplements: (marble and plasma6-desktop) Conflicts: marble-frontend Provides: marble-frontend = %{version} @@ -109,7 +113,7 @@ The KDE frontend for the Marble map viewer. It also includes several plasmoids a %package data Summary: Generic map viewer: data -Requires: %{name} = %{version} +Requires: marble = %{version} Obsoletes: marble5-data < %{version} Provides: marble5-data < %{version} BuildArch: noarch @@ -120,21 +124,22 @@ Marble is a viewer of map data. This package contains its data. %package devel Summary: Generic map viewer: Build Environment Requires: libastro%{_so_astro} = %{version} -Requires: libmarblewidget-qt5%{_so} = %{version} -Requires: cmake(Qt5Widgets) -Requires: cmake(Qt5Xml) +Requires: libmarblewidget-qt6%{_so} = %{version} +Requires: cmake(Qt6Core5Compat) >= %{qt6_version} +%if 0%{?with_webengine} +Requires: cmake(Qt6WebEngineWidgets) >= %{qt6_version} +%endif +Requires: cmake(Qt6Widgets) >= %{qt6_version} +Requires: cmake(Qt6Xml) >= %{qt6_version} Obsoletes: marble5-devel < %{version} Provides: marble5-devel = %{version} -%ifarch %{ix86} x86_64 %{x86_64} %{arm} aarch64 -Requires: cmake(Qt5WebEngineWidgets) -%endif %description devel Development headers and libraries for Marble. %package doc Summary: Marble documentation -Requires: %{name} = %{version} +Requires: marble = %{version} Obsoletes: marble5-doc < %{version} Provides: marble5-doc = %{version} BuildArch: noarch @@ -142,15 +147,15 @@ BuildArch: noarch %description doc Marble is a viewer of map data. This package contains its documentation. -%package -n libmarblewidget-qt5%{_so} +%package -n libmarblewidget-qt6%{_so} Summary: Generic map viewer: Shared Library -%description -n libmarblewidget-qt5%{_so} +%description -n libmarblewidget-qt6%{_so} The shared library for the MarbleWidget shared library. %package -n libastro%{_so_astro} Summary: Astronomy: Shared Library -Requires: libmarblewidget-qt5%{_so} +Requires: libmarblewidget-qt6%{_so} Obsoletes: libastro-qt5-%{_so_astro} < %{version} Provides: libastro-qt5-%{_so_astro} = %{version} @@ -164,92 +169,99 @@ The astronomy library for the satellites plugin. %build export SUSE_ASNEEDED=0 -%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 +%cmake_kf6 \ + -DMOBILE:BOOL=FALSE \ + -DQT_PLUGINS_DIR:STRING=%{_kf6_plugindir} \ + -DBUILD_QT_AND_KDE:BOOL=TRUE + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man --all-name --with-qt -%{kf5_find_htmldocs} +%find_lang %{name} --with-html --all-name --with-qt %fdupes %{buildroot} -%ldconfig_scriptlets -n libmarblewidget-qt5%{_so} +%ldconfig_scriptlets -n libmarblewidget-qt6%{_so} %ldconfig_scriptlets -n libastro%{_so_astro} %files %license COPYING* LICENSE* %doc CREDITS ChangeLog MANIFESTO.txt -%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 -%{_kf5_applicationsdir}/marble_kml.desktop -%{_kf5_applicationsdir}/marble_kmz.desktop -%{_kf5_applicationsdir}/marble_shp.desktop -%{_kf5_applicationsdir}/marble_worldwind.desktop -%{_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_debugdir}/marble.categories -%{_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}/marblethumbnail.so -%{_kf5_qmldir}/org/kde/marble/ -%{_kf5_servicesdir}/*desktop -%{_kf5_sharedir}/marble/ -%{_kf5_sharedir}/mime/packages/geo.xml +%{_kf6_applicationsdir}/marble_geo.desktop +%{_kf6_applicationsdir}/marble_geojson.desktop +%{_kf6_applicationsdir}/marble_gpx.desktop +%{_kf6_applicationsdir}/marble_kml.desktop +%{_kf6_applicationsdir}/marble_kmz.desktop +%{_kf6_applicationsdir}/marble_shp.desktop +%{_kf6_applicationsdir}/marble_worldwind.desktop +%{_kf6_appstreamdir}/org.kde.marble.appdata.xml +%{_kf6_appstreamdir}/org.kde.marble.behaim.appdata.xml +%{_kf6_appstreamdir}/org.kde.marble.maps.appdata.xml +%{_kf6_appstreamdir}/org.kde.plasma.worldclock.appdata.xml +%{_kf6_appstreamdir}/org.kde.plasma.worldmap.appdata.xml +%{_kf6_configkcfgdir}/marble.kcfg +%{_kf6_debugdir}/marble.categories +%{_kf6_iconsdir}/hicolor/*/apps/marble.* +%{_kf6_iconsdir}/hicolor/scalable/apps/org.kde.marble.{behaim,maps}.svg +%{_kf6_kxmlguidir}/marble/ +%{_kf6_libdir}/marble/ +%{_kf6_plugindir}/designer/ +%dir %{_kf6_plugindir}/kf6/krunner/ +%{_kf6_plugindir}/kf6/krunner/plasma_runner_marble.so +%{_kf6_plugindir}/libmarble_part.so +%{_kf6_plugindir}/marblethumbnail.so +%{_kf6_qmldir}/org/kde/marble/ +%{_kf6_sharedir}/mime/packages/geo.xml %files devel %doc BUGS CODING %{_includedir}/astro/ %{_includedir}/marble/ -%{_kf5_cmakedir}/Astro/ -%{_kf5_cmakedir}/Marble/ -%{_kf5_libdir}/libastro.so -%{_kf5_libdir}/libmarblewidget-qt5.so -%{_kf5_mkspecsdir}/qt_Marble.pri +%{_kf6_cmakedir}/Astro/ +%{_kf6_cmakedir}/Marble/ +%{_kf6_libdir}/libastro.so +%{_kf6_libdir}/libmarblewidget-qt6.so +%{_kf6_mkspecsdir}/qt_Marble.pri %files data -%{_datadir}/marble/data +%dir %{_kf6_sharedir}/marble +%{_kf6_sharedir}/marble/data/ %files doc -%doc %lang(en) %{_kf5_htmldir}/en/marble/ +%doc %lang(en) %{_kf6_htmldir}/en/marble/ -%files -n libmarblewidget-qt5%{_so} -%{_kf5_libdir}/libmarblewidget-qt5.so.* +%files -n libmarblewidget-qt6%{_so} +%{_kf6_libdir}/libmarblewidget-qt6.so.* %files -n libastro%{_so_astro} -%{_kf5_libdir}/libastro.so.* +%{_kf6_libdir}/libastro.so.* %files qt -%{_kf5_applicationsdir}/org.kde.marble-qt.desktop -%{_kf5_bindir}/marble-qt +%{_kf6_applicationsdir}/org.kde.marble-qt.desktop +%{_kf6_bindir}/marble-qt %files kde -%{_kf5_applicationsdir}/org.kde.marble.desktop -%{_kf5_bindir}/marble -%dir %{_datadir}/plasma -%{_datadir}/plasma/plasmoids/ -%{_datadir}/plasma/wallpapers/ +%{_kf6_applicationsdir}/marble_thumbnail_kml.desktop +%{_kf6_applicationsdir}/marble_thumbnail_kmz.desktop +%{_kf6_applicationsdir}/marble_thumbnail_osm.desktop +%{_kf6_applicationsdir}/marble_thumbnail_shp.desktop +%{_kf6_applicationsdir}/org.kde.marble.behaim.desktop +%{_kf6_applicationsdir}/org.kde.marble.desktop +%{_kf6_applicationsdir}/org.kde.marble.maps.desktop +%{_kf6_bindir}/marble +%{_kf6_bindir}/marble-behaim +%{_kf6_bindir}/marble-maps +%{_kf6_plasmadir}/plasmoids/org.kde.plasma.worldclock +%{_kf6_plasmadir}/wallpapers/ %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/marble/ %changelog