Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at 2024-12-13 22:37:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marble (Old) and /work/SRC/openSUSE:Factory/.marble.new.29675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "marble" Fri Dec 13 22:37:04 2024 rev:184 rq:1230533 version:24.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/marble/marble.changes 2024-11-08 12:03:26.247617282 +0100 +++ /work/SRC/openSUSE:Factory/.marble.new.29675/marble.changes 2024-12-13 22:39:42.933511639 +0100 @@ -1,0 +2,24 @@ +Sun Dec 8 09:28:26 UTC 2024 - Christophe Marin <[email protected]> + +- 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 <[email protected]> + +- 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 <[email protected]> + +- Update to 24.11.80 + * New feature release +- Too many changes to list here. + +------------------------------------------------------------------- Old: ---- marble-24.08.3.tar.xz marble-24.08.3.tar.xz.sig New: ---- marble-24.12.0.tar.xz marble-24.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.W3vl2M/_old 2024-12-13 22:39:43.565537984 +0100 +++ /var/tmp/diff_new_pack.W3vl2M/_new 2024-12-13 22:39:43.565537984 +0100 @@ -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 @@ 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 @@ %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 @@ %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 @@ %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 @@ %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,91 +169,98 @@ %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/ ++++++ marble-24.08.3.tar.xz -> marble-24.12.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/marble/marble-24.08.3.tar.xz /work/SRC/openSUSE:Factory/.marble.new.29675/marble-24.12.0.tar.xz differ: char 26, line 1
