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/kmplot-23.08.4.tar.xz b/kmplot-23.08.4.tar.xz deleted file mode 100644 index 7b8a87d..0000000 --- a/kmplot-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22bdbef141434ba7a51a4789fffaac00813867feb8e7efca74651a79a152bdfe -size 3101432 diff --git a/kmplot-23.08.4.tar.xz.sig b/kmplot-23.08.4.tar.xz.sig deleted file mode 100644 index 2ae146c..0000000 --- a/kmplot-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7l4ACgkQu0YzUNbv -Me95dQ//VeGpYfp4Bo9WaJUzHteXBiKcGWawDpNMDhkbw6eoj7+Tl6hL/9SQlzDn -LcM1b0OH6+OADczIthpLg482z9KadX71heB5sLCbPCiRZs20OilKGplnVLpg4S9x -ddYVzsQxkszgVBq+x+8gp1Yz2Pageml46ve9n6UiE9BRCnkH6Rc5N2Q+yn8jlPGk -u6hKXEaSstKcL+sEAIcBPk5L3uuCXl3LWQvIv46CR4HRJbRnJhsRlq5RCEwqyDv5 -NulrrOy9mjGk53g6IqnT3ZY9ylA2Wf/Vqhyv4A5skljndMSteEVqKG15iJzr60OX -b5Fm0K/5z3VPR+uvlQswVbeIbW70gaymhdMmMi0zLkZaqcj2iBeJdZhQuAYR9ZOD -EZFtrfYKJVNfPRImcnEwPy80V7uVuassf9Nl6ffMFKgXp+JTXimfdbyUCs8hg+Ci -SmZ4PC+YeX5rG6ysUd0JcBWBJqG4U/HX6RIiXWWzFhJpkiXHucgYZkoQwZMj4Yf0 -VlZR34Q5IzlV44OEQunKvaqeKsyBDxtNDOBibCDs5whtNShLd14OYucgfliHUvdB -OXpcI0Py4xTeenpNMpM7A1omhd8MYzFVXfGy9x4pnCv9Pg1TV5+7OL0WXSGmm3bh -9E6rG9OJeo8MW/8sNGLih3UI67G4+hi4RWY7nvdb7i0Yn+NqdNc= -=aVPy ------END PGP SIGNATURE----- diff --git a/kmplot-24.01.95.tar.xz b/kmplot-24.01.95.tar.xz new file mode 100644 index 0000000..93681b6 --- /dev/null +++ b/kmplot-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3296af93ec3fc4e509e123f1c1f0bb54cca069226bf21688c9e90460d4ac9e63 +size 3100204 diff --git a/kmplot-24.01.95.tar.xz.sig b/kmplot-24.01.95.tar.xz.sig new file mode 100644 index 0000000..166f3c4 --- /dev/null +++ b/kmplot-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44UIACgkQOmpNuDnq +ptcbUw/+OVoHH8hXtueSfV8QIiy9tLUKaaIn1jcJCXmP4DH2GHgwkR6BY5CcCtKC +zGusFk7ORyCQU/AoVekhHvLUoLqus1rj9ghUjxotkWM77RDxCQm+aGLofZlPtPyf +whgLmCL1tYXQNdmETEauWTL667ikiUTOB6ApWAfQB1z7jmsI6k5ZBjhmQpScQg9g +N4C2vO9pLn7N59jTPJCedUj35U/0wUBYGL/DffAgssKeeRViMIudOhh/GNQBwf4Q +6mQraLqX7lZn7ZrnK1xc6Rhvi5/xHfncjPA6w9KlnnCGdMEkabZFX5eQD/rH1942 +TyrqYngJ7OvyWF+10/2EgClqanQaJqoh1y9v3j3pDUXZb5J8bGpffBlIjVRjqygf +vuseLwSFL5t/Bxvyv45OuiM2Ef8bkcvgVDFDAERc9wQIEkFSfpgrmzlwetBZ5YR2 +RURR7KIcph22Xvy9ULcQiWv9tCXhKl6mEB+5qQmPTt/kX8iU4w3vAnAE0RopV7A5 +Nhkk/G5UflxkwEPg2QiF0NfUaVekPyvYafEqL+A4sk4kwYVdrEYm7s6q7lJ4mxvD +y6Tzrg3qtbXusMFhf4g7+bB/fPnQ9Z+7T0aWb0Aj7p4mwlw7cGsk6h7Dwiu0UtiB +WzeAG7/fEuMoez9fhvcjFd9Lz+xyWfVwx0jSAv+SrmP6D9ZT0B4= +=8O2D +-----END PGP SIGNATURE----- diff --git a/kmplot.changes b/kmplot.changes index 8f6a392..56d07d3 100644 --- a/kmplot.changes +++ b/kmplot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:08:53 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:19:54 UTC 2023 - Christophe Marin diff --git a/kmplot.spec b/kmplot.spec index 3db17a5..777fb89 100644 --- a/kmplot.spec +++ b/kmplot.spec @@ -1,7 +1,7 @@ # # spec file for package kmplot # -# 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 @@ -16,32 +16,37 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kmplot -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Mathematical Function Plotter License: GPL-2.0-or-later URL: https://apps.kde.org/kmplot -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 -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5KDELibs4Support) -BuildRequires: cmake(KF5Parts) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5PrintSupport) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Widgets) -Obsoletes: %{name}5 < %{version} -Provides: %{name}5 = %{version} +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: cmake(KF6Crash) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6GuiAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6Parts) >= %{kf6_version} +BuildRequires: cmake(KF6TextWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +Obsoletes: kmplot5 < %{version} +Provides: kmplot5 = %{version} %description Mathematical function plotter by KDE. @@ -55,31 +60,28 @@ Mathematical function plotter by KDE. %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man --all-name -%{kf5_find_htmldocs} +%find_lang %{name} --with-html --with-man --all-name %files %license LICENSES/* -%dir %{_kf5_plugindir}/kf5 -%dir %{_kf5_plugindir}/kf5/parts -%doc %lang(en) %{_kf5_htmldir}/en/kmplot -%{_kf5_applicationsdir}/org.kde.kmplot.desktop -%{_kf5_appstreamdir}/org.kde.kmplot.appdata.xml -%{_kf5_bindir}/kmplot -%{_kf5_configkcfgdir}/kmplot.kcfg -%{_kf5_dbusinterfacesdir}/org.kde.kmplot.*.xml -%{_kf5_iconsdir}/hicolor/*/apps/kmplot.* -%{_kf5_kxmlguidir}/kmplot/ -%{_kf5_plugindir}/kf5/parts/kmplotpart.so -%{_kf5_servicesdir}/kmplot_part.desktop -%{_mandir}/*/kmplot.1%{?ext_man} +%doc %lang(en) %{_kf6_htmldir}/en/kmplot +%doc %lang(en) %{_kf6_mandir}/man1/kmplot.1%{?ext_man} +%{_kf6_applicationsdir}/org.kde.kmplot.desktop +%{_kf6_appstreamdir}/org.kde.kmplot.appdata.xml +%{_kf6_bindir}/kmplot +%{_kf6_configkcfgdir}/kmplot.kcfg +%{_kf6_dbusinterfacesdir}/org.kde.kmplot.*.xml +%{_kf6_iconsdir}/hicolor/*/apps/kmplot.* +%{_kf6_plugindir}/kf6/parts/kmplotpart.so %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kmplot %changelog