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/kiten-23.08.4.tar.xz b/kiten-23.08.4.tar.xz deleted file mode 100644 index 26177aa..0000000 --- a/kiten-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:693435807d47bb89f4e90a859b01f048ffdadf469248d36dc5bf2effafaa5990 -size 11336344 diff --git a/kiten-23.08.4.tar.xz.sig b/kiten-23.08.4.tar.xz.sig deleted file mode 100644 index 577a475..0000000 --- a/kiten-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7kMACgkQu0YzUNbv -Me/Csg/+MCUXDe4KM0LuJolrshSu85o+ENrq8ZOkHP2CG+tFCTAMCzfIYcXKnozQ -1XabgeKlE8oUgcRqWd+OfLUAX8M3GlkPofqD4wYF1+cwW/c2dR0KLq8H1uvh7HWJ -zfsPGBjejCEs8nrJlPb079z5HvZmRC6Ep4PQDLf6I2stz681aJ0cZMkAzEsrpMnD -8rmyBPJCL4cu6QYvVcV7uL02CXJniXMpn8J3ol0I0KgVcgNVPCyvb4QQTn7BcN7Z -k9pg2TWhTOYnPLRVz8alFdTgtrOPojqiiDhxy3+rsn4wiYiPm2bWXM+is/4UAz+I -Rx4OdGq7gn33XBrvd+zIN1z04bYMtuX5XuzdUdA0Iiaz2OlAEQCeCvr3iA+Jcq7z -04BaEUTwuWn9LCcV0SMho2iMTuMGgpqULx12DNAP+9PCVVWkn37CHZHOy0ZrYVzf -GKhPGfJyYsw1f4UV44Yzz4tsEYbXg9P/+2wFc8Mv3ITFp1hP341fXoWesiuzmlwo -lBPMgcc9HzRV4k7Lu7wTb4CYYF+V2vD7U982/C9bcHlyQrgKve+HBbgJg4ccZ4t7 -IyheI9usjmhNDwaGAB9q3YK7l7J/MEM+unnBrxi+8/53yz4zgp5PVgjBN+o3Y82z -1R9UJ94QsXNx7RViJ5y6l4hQZykAFlUcIKRZTzxNBYuwxxdXArc= -=J1DB ------END PGP SIGNATURE----- diff --git a/kiten-24.02.0.tar.xz b/kiten-24.02.0.tar.xz new file mode 100644 index 0000000..46549a9 --- /dev/null +++ b/kiten-24.02.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7add9a0a212275529473c59ce4e47f86c987bbc21363dc96ed5c23be09596181 +size 11332304 diff --git a/kiten-24.02.0.tar.xz.sig b/kiten-24.02.0.tar.xz.sig new file mode 100644 index 0000000..18fbfae --- /dev/null +++ b/kiten-24.02.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVq2oACgkQu0YzUNbv +Me9FyhAAi9MS3Nkgr1a8v/YHZZ5sxwsAqeIUyFuKZLBwBlHatAApO7kBgitRhz8T +r5RsSSTf20FVAwkWDPkp5tC+laowZCYjyVYQlRb//GWNp4GRZXRicwHkiCerNMgN +Xh2+1F2qo3NuBj4sLYBNIrhiaG4NgiLwvrEOXEsuHkRvyDCpNT4eXjYFyA2b4pH9 +jXtoNjQh4rVyA7zid9RC+KuOfAVl5SfBlcA710SooHwg5rTSuut19N/EIfeArdlz +7CJv1zA4hPSQ3l4EwDqDRYVqMb6ftggQGFYwVn81BwMUzgQLjqFzny/L948uYQxx +HAjTBsAMVAQcMWYSLMVogkclX2gluYX3CEl8oCaCiYekbXO8dspuBq95uB/1eony +QyXECNT7f/YJlP14HkFBDW228s0c/jxv9893YPqg5sdnuIjA6JXZKmYNrOBiHU4x +62Eh2pbSibK91x8o/Ig06LlMbN5SCnOlNvKp5j/HJmoIimyRdFw0ig44NKFVdajA +YFmm4Tk8zGokiu1A7jPuQ4drO3b+Nx2g57dRsfxzfYpbO/kGHFPZMui65NUSfsFm +cQaR9t/wI9R9FQnhWvVrpJ03iEggoKig4dym7llu2Pj48Snjw6N5VqNQcibORxEG +4ZmkkFXrIG44Q3cI1Eytb67VOIZo0AKQO5GVl7QO0c3oa0u4Kcg= +=ObhX +-----END PGP SIGNATURE----- diff --git a/kiten.changes b/kiten.changes index 346b260..2010a5d 100644 --- a/kiten.changes +++ b/kiten.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Feb 23 13:59:30 UTC 2024 - Christophe Marin + +- Update to 24.02.0 + * New feature release +- No code change since 24.01.95 + +------------------------------------------------------------------- +Fri Feb 9 16:08:36 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:19:44 UTC 2023 - Christophe Marin diff --git a/kiten.spec b/kiten.spec index 7318ce8..f4512d6 100644 --- a/kiten.spec +++ b/kiten.spec @@ -1,7 +1,7 @@ # # spec file for package kiten # -# 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,43 +16,45 @@ # +%define kf6_version 5.240.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kiten -Version: 23.08.4 +Version: 24.02.0 Release: 0 Summary: Japanese Reference/Study Tool # Data files are under CC-BY-SA-3.0 (edict) and CC-BY-SA-4.0 ("kanjidic"/SKIP numbers therein) License: GPL-2.0-or-later AND CC-BY-SA-3.0 AND CC-BY-SA-4.0 URL: https://apps.kde.org/kiten -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: %{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -BuildRequires: extra-cmake-modules -BuildRequires: kf5-filesystem +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: update-desktop-files -BuildRequires: xz -BuildRequires: cmake(KF5Archive) -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Notifications) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(KF6Archive) >= %{kf6_version} +BuildRequires: cmake(KF6Completion) >= %{kf6_version} +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6ConfigWidgets) >= %{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(KF6Notifications) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(KF6StatusNotifierItem) >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} %if 0%{?suse_version} >= 1599 BuildRequires: edict-eucjp >= 20230511 Requires: edict-eucjp >= 20230511 %endif Requires: fonts-KanjiStrokeOrders -Obsoletes: %{name}5 < %{version} -Provides: %{name}5 = %{version} +Provides: kiten5 = %{version} +Obsoletes: kiten5 < %{version} %description Kiten is a tool to learn Japanese. @@ -71,7 +73,6 @@ This package contains files for developing applications using kiten. Summary: Font for learning Japanese Kanji License: BSD-3-Clause BuildRequires: fontpackages-devel -Provides: kdeedu4:%{_kde4_datadir}/fonts/kanjistrokeorders/KanjiStrokeOrders.ttf BuildArch: noarch %reconfigure_fonts_prereq @@ -94,19 +95,20 @@ stroke order used in other languages that use Chinese characters. %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 +%kf6_install %if 0%{?suse_version} >= 1599 for i in edict kanjidic radkfile; do - ln -fsv "%_datadir/edict/$i.eucjp" "%buildroot/%_datadir/kiten/$i" + ln -fsv "%{_datadir}/edict/$i.eucjp" "%{buildroot}%{_datadir}/kiten/$i" done %endif -%find_lang %{name} --with-man --all-name -%{kf5_find_htmldocs} +%find_lang %{name} --with-html --all-name %reconfigure_fonts_scriptlets -n fonts-KanjiStrokeOrders @@ -114,32 +116,31 @@ done %files %license LICENSES/* -%doc AUTHORS README -%doc %lang(en) %{_kf5_htmldir}/en/kiten/ -%{_kf5_applicationsdir}/org.kde.kiten.desktop -%{_kf5_applicationsdir}/org.kde.kitenkanjibrowser.desktop -%{_kf5_applicationsdir}/org.kde.kitenradselect.desktop -%{_kf5_appstreamdir}/org.kde.kiten.appdata.xml -%{_kf5_bindir}/kiten -%{_kf5_bindir}/kitengen -%{_kf5_bindir}/kitenkanjibrowser -%{_kf5_bindir}/kitenradselect -%{_kf5_configkcfgdir}/ -%{_kf5_iconsdir}/hicolor/*/*/kiten.* -%{_kf5_libdir}/libkiten.so.* -%{_kf5_sharedir}/kiten/ -%{_kf5_sharedir}/kxmlgui5/ +%doc AUTHORS README.md +%doc %lang(en) %{_kf6_htmldir}/en/kiten/ +%{_kf6_applicationsdir}/org.kde.kiten.desktop +%{_kf6_applicationsdir}/org.kde.kitenkanjibrowser.desktop +%{_kf6_applicationsdir}/org.kde.kitenradselect.desktop +%{_kf6_appstreamdir}/org.kde.kiten.appdata.xml +%{_kf6_bindir}/kiten +%{_kf6_bindir}/kitenkanjibrowser +%{_kf6_bindir}/kitenradselect +%{_kf6_configkcfgdir}/kiten.kcfg +%{_kf6_iconsdir}/hicolor/*/*/kiten.* +%{_kf6_libdir}/libkiten.so.* +%{_kf6_sharedir}/kiten/ %files devel -%{_kf5_libdir}/libkiten.so -%{_kf5_prefix}/include/libkiten/ +%{_kf6_libdir}/libkiten.so +%{_includedir}/libkiten/ %files -n fonts-KanjiStrokeOrders %license data/font/KanjiStrokeOrders.ttf.license -%doc data/font/readme_*.txt -%dir %{_kf5_sharedir}/fonts/kanjistrokeorders/ -%{_kf5_sharedir}/fonts/kanjistrokeorders/KanjiStrokeOrders.ttf +%doc data/font/readme_en_v2.016.txt +%dir %{_kf6_sharedir}/fonts/kanjistrokeorders/ +%{_kf6_sharedir}/fonts/kanjistrokeorders/KanjiStrokeOrders.ttf %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kiten/ %changelog