From 068ff4cb7343b33298ba869d977547f3f5c8941f Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 29 Mar 2024 19:07:10 +0100 Subject: [PATCH] automatic version update by autodist [release 24.02.1-1mamba;Sun Mar 24 2024] --- marble.spec | 60 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/marble.spec b/marble.spec index 0298bd3..9698b98 100644 --- a/marble.spec +++ b/marble.spec @@ -1,5 +1,5 @@ Name: marble -Version: 23.08.5 +Version: 24.02.1 Release: 1mamba Summary: A free open source geographical map program Group: Graphical Desktop/Applications/Educational @@ -7,7 +7,7 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://apps.kde.org/marble/ -Source: http://download.kde.org/stable/release-service/%{version}/src/marble-%{version}.tar.xz +Source: https://download.kde.org/%{stable_kde6}/release-service/%{version}/src/marble-%{version}.tar.xz Patch0: marble-4.13.0-arm_qreal_double.patch Patch1: marble-15.12.2-gcc-5.3.0-std_isnan.patch License: LGPL @@ -102,67 +102,69 @@ This package contains libraries and header files for developing applications tha %patch 1 -p1 %build -%cmake_kde5 -d build +%cmake_kf6 -%make +%cmake_build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall -C build +%cmake_install -%find_lang %{name}5_qt --with-qt --with-html --with-html --all-name || touch %{name}5_qt.lang +%find_lang %{name} --with-qt --with-html --with-html --all-name || touch %{name}.lang %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %post -touch --no-create %{_kde5_icondir}/hicolor &>/dev/null +touch --no-create %{_kf6_icondir}/hicolor &>/dev/null exit 0 %posttrans -gtk-update-icon-cache %{_kde5_icondir}/hicolor &>/dev/null +gtk-update-icon-cache %{_kf6_icondir}/hicolor &>/dev/null exit 0 %postun if [ $1 -eq 0 ]; then - touch --no-create %{_kde5_icondir}/hicolor &>/dev/null - gtk-update-icon-cache %{_kde5_icondir}/hicolor &>/dev/null + touch --no-create %{_kf6_icondir}/hicolor &>/dev/null + gtk-update-icon-cache %{_kf6_icondir}/hicolor &>/dev/null fi exit 0 %post -n libmarble -p /sbin/ldconfig %postun -n libmarble -p /sbin/ldconfig -%files -f %{name}5_qt.lang +%files -f %{name}.lang %defattr(-,root,root) -%{_kde5_bindir}/marble -%{_kde5_bindir}/marble-qt -%dir %{_kde5_datadir}/marble -%{_kde5_datadir}/marble/* +%{_kf6_bindir}/marble +%{_kf6_bindir}/marble-qt +%dir %{_kf6_datadir}/marble +%{_kf6_datadir}/marble/* %{_datadir}/mime/packages/geo.xml -%dir %{_datadir}/kxmlgui5/marble -%{_datadir}/kxmlgui5/marble/* +%{_datadir}/applications/marble*.desktop %{_datadir}/applications/org.kde.marble*.desktop %{_datadir}/metainfo/org.kde.*.xml -#%{_datadir}/knsrcfiles/marble.knsrc +%{_datadir}/kservices5/marble_*.desktop +%{_datadir}/kservices5/plasma-applet-org.kde.plasma.worldclock.desktop +%{_datadir}/kservices5/plasma-wallpaper-org.kde.plasma.worldmap.desktop +%{_datadir}/kxmlgui5/marble/marble_part.rc +%{_datadir}/kxmlgui5/marble/marbleui.rc +%{_datadir}/qlogging-categories5/marble.categories %{_datadir}/plasma/plasmoids/org.kde.plasma.worldclock/* %dir %{_datadir}/plasma/wallpapers/org.kde.plasma.worldmap %{_datadir}/plasma/wallpapers/org.kde.plasma.worldmap/* -%{_kde5_icondir}/hicolor/*/apps/marble.png -%{_kde5_kcfgdir}/marble.kcfg -%{_kde5_servicesdir}/*.desktop -%{_kde5_xdgappsdir}/marble*.desktop +%{_kf6_icondir}/hicolor/*/apps/marble.png +%{_kf6_kcfgdir}/marble.kcfg %files -n libmarble %defattr(-,root,root) -%{_libdir}/qt5/plugins/libmarble_part.so -%{_libdir}/qt5/plugins/marblethumbnail.so -%{_libdir}/qt5/plugins/kf5/krunner/plasma_runner_marble.so +%{_libdir}/qt6/plugins/libmarble_part.so +%{_libdir}/qt6/plugins/marblethumbnail.so +%{_qt6_plugindir}/kf5/krunner/plasma_runner_marble.so %{_libdir}/libastro.so.* %{_libdir}/libmarbledeclarative.so %{_libdir}/libmarblewidget-qt5.so.* %dir %{_libdir}/marble -%{_libdir}/qt5/qml/org/kde/marble/private/plasma/* +%{_kf6_qmldir}/org/kde/marble/private/plasma/* %dir %{_libdir}/marble/plugins %{_libdir}/marble/plugins/*.so %dir %{_libdir}/plugins/designer @@ -186,6 +188,12 @@ exit 0 #%doc docs/* %changelog +* Sun Mar 24 2024 Automatic Build System 24.02.1-1mamba +- automatic version update by autodist + +* Tue Mar 05 2024 Automatic Build System 24.02.0-1mamba +- automatic version update by autodist + * Fri Feb 16 2024 Automatic Build System 23.08.5-1mamba - automatic version update by autodist