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/kbruch-23.08.4.tar.xz b/kbruch-23.08.4.tar.xz deleted file mode 100644 index a9f7b16..0000000 --- a/kbruch-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cac59c9266d275ec3e76f321d0e9fd7799ef5d16afa0a0e41ce029dc334d3e6 -size 5662880 diff --git a/kbruch-23.08.4.tar.xz.sig b/kbruch-23.08.4.tar.xz.sig deleted file mode 100644 index 4762d1c..0000000 --- a/kbruch-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7hUACgkQu0YzUNbv -Me8Tcw//eIdr0LPCBdhZ2cl8A4LA+JQSgPLprQ7g9/NNEBUi44atjRvRwYP4at7s -vw4bE65M5kYNBhlW9u2xeN0nOjr+EtH9bLFjmlCwWWScw+kmqKu17WShQ7HZUedl -5+xmPN2O7MkBqTEoxF1AVS5A5LXBCESlxMg1JuidRGdSY/xYg2kwhgtW2jRw731I -yM2/qkj5Wf3OHcQjN7LcalxKhxzTx/LSesdyq34cf6AMh/+pM8Jda5GaJUI2ljvH -PhqgOIXvMj8EwrVRdxJnEIDDDoEcx1YoAiJP1+YzM+xDeKwsKdlbj+4zQ1+YCL5o -WPB71cqalYAq6pJDnrJbMMNj55E4GLqtUBqNmG1Pacl1weuhoniSSU+Aclnjwmvf -LXR+YfEmHpAhjjoMu1JsXWhDtv6diuKUdnn8cxr7+clPmImKjNtGfdcrSf+EnQQU -f5z1pk9UnzUO0JAOCtgNLFoE0xp+X4nmkVrGGK0gqMWjYTG7Js59eZKlke7XlFQj -Nz1LlNzgPWb4RjmxksawtBKq2I6hsHJ4IMu8eE7RzTwEuICvGqFWSRsARaYhz+er -QtZ/pn+qeDLDs6gSKHBnebq54S0r5GlV0VXU6zzWh2svH6VJNYg5XPJpjVhBz/WX -V7fNpWEZSJjcjjtPiNEG79wIPGxowsrw8HZoOQuVYDxxkayYhsk= -=0XFK ------END PGP SIGNATURE----- diff --git a/kbruch-24.01.95.tar.xz b/kbruch-24.01.95.tar.xz new file mode 100644 index 0000000..45a3326 --- /dev/null +++ b/kbruch-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:250038e3e3a74a35fff363920719dc58d62e723364265a25122f1f8d32517f2e +size 5662640 diff --git a/kbruch-24.01.95.tar.xz.sig b/kbruch-24.01.95.tar.xz.sig new file mode 100644 index 0000000..22b4dd0 --- /dev/null +++ b/kbruch-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44PYACgkQOmpNuDnq +ptcWGQ/+IkXYXPHsrIsJSptKtWR9H4xh3tVLvVikB6IwVSfODElwFkuydOmvUcRc +dez+UtdIjnLldqQ4iHvg0lpG5d0tqOsR6OynSlQVsQei2dl3rEMqGH4ZQqKFvJRa +C/PoNxbxlw6YvGXTFdUwF1M2JyA+vrhmQyyiTabuKC5gp7Iap5i/korBj0qECaaP ++0Z2bC0fQMUFU0eG4AGJJua/Sefy7nQ7D0ovjRQG4HDxs7mXva5i4vxOL5uBH7JZ +xiee65HdUr8r/XS+X2W5J8rnnzqPPeTpeM9MvZi+V9ytUZYky+7sxTOIktVJIVT+ +ZaRjgEnNrkZnlNP058cNrvoIzHYE8584F2zMXq2CMl0wAUf7fNL8CTIHtcnTMPs2 +DjnApZlEuMkBEdYYlEeiALdGD/YoWfnTBOG1JGCo6JSbaQFvvUGXZVtQ8XzPX8cS +VWcTLdvVkJ+5idjQWGNwH1HwsBZZ5k/Cgw0dtmw50+rM5XxZQ7/1ecYTCKnXcdml +Yij/UC/Y32OLCuXf6SMyDxzH1E2AhRuzEXCc3lR7XQkfuanF2OxQCRL0N6hNcvTw +uvnNy8lshtGJ+KNQxykrPzXlf33K7pre4M9rmGyn8th+Kuf2SvELOAesgp2TSGRJ +1K2ihzcyGLrXY8K8dxJu6HQSrZ07ob1zYTY9MYnFzNzhkLOtV1c= +=apWT +-----END PGP SIGNATURE----- diff --git a/kbruch.changes b/kbruch.changes index 939c4d5..7718de1 100644 --- a/kbruch.changes +++ b/kbruch.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:07:55 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:19:19 UTC 2023 - Christophe Marin diff --git a/kbruch.spec b/kbruch.spec index e928921..448cbfd 100644 --- a/kbruch.spec +++ b/kbruch.spec @@ -1,7 +1,7 @@ # # spec file for package kbruch # -# 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,30 +16,33 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kbruch -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Application to excercise fractions License: GPL-2.0-or-later URL: https://apps.kde.org/kbruch -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: update-desktop-files -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Widgets) -Obsoletes: %{name}5 < %{version} -Provides: %{name}5 = %{version} +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +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(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +Obsoletes: kbruch5 < %{version} +Provides: kbruch5 = %{version} %description KBruch is an application to learn calculating with fractions. @@ -53,29 +56,28 @@ KBruch is an application to learn calculating with fractions. %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 + +%kf6_build %install -%kf5_makeinstall -C build - -%find_lang %{name} --with-man --all-name -%{kf5_find_htmldocs} +%kf6_install +%find_lang %{name} --with-html --with-man --all-name %files %license LICENSES/* %doc AUTHORS ChangeLog NEWS README -%doc %lang(en) %{_kf5_htmldir}/en/kbruch/ -%{_kf5_applicationsdir}/org.kde.kbruch.desktop -%{_kf5_appstreamdir}/org.kde.kbruch.appdata.xml -%{_kf5_bindir}/kbruch -%{_kf5_configkcfgdir}/ -%{_kf5_iconsdir}/hicolor/*/apps/kbruch.* -%{_kf5_kxmlguidir}/kbruch/ -%{_kf5_sharedir}/kbruch/ -%{_mandir}/man1/kbruch.1%{?ext_man} +%doc %lang(en) %{_kf6_htmldir}/en/kbruch/ +%doc %lang(en) %{_mandir}/man1/kbruch.1%{?ext_man} +%{_kf6_applicationsdir}/org.kde.kbruch.desktop +%{_kf6_appstreamdir}/org.kde.kbruch.appdata.xml +%{_kf6_bindir}/kbruch +%{_kf6_configkcfgdir}/kbruch.kcfg +%{_kf6_iconsdir}/hicolor/*/apps/kbruch.* +%{_kf6_sharedir}/kbruch/ %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kbruch/ %changelog