From 96f2dc6405fc5a9d5b8001f8cc9fd2fe07af470c5288d5dac5fa2352f8a4bf7b Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 23 Feb 2024 20:08:20 +0000 Subject: [PATCH] KDE Gear 24.02 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kiten?expand=0&rev=191 --- applications.keyring | Bin 6936 -> 5710 bytes kiten-23.08.4.tar.xz | 3 -- kiten-23.08.4.tar.xz.sig | 16 ------ kiten-24.01.95.tar.xz | 3 ++ kiten-24.01.95.tar.xz.sig | 16 ++++++ kiten.changes | 6 +++ kiten.spec | 99 +++++++++++++++++++------------------- 7 files changed, 75 insertions(+), 68 deletions(-) delete mode 100644 kiten-23.08.4.tar.xz delete mode 100644 kiten-23.08.4.tar.xz.sig create mode 100644 kiten-24.01.95.tar.xz create mode 100644 kiten-24.01.95.tar.xz.sig diff --git a/applications.keyring b/applications.keyring index 9b6ab5c7fcff549a5c7c241e56901e15961ca2d85add060b3d44e0c17f90c88d..299808814995a7df8af874c79c21b829723206c7161c5b8fa8cfe0dc780a9ae5 100644 GIT binary patch delta 575 zcmV-F0>J&4HqI=t5dyPq1l9zz5CU8RvqK3p1hYUAZvua0`acK-2@=uIWdI5Z5ISm2 zxH;;k*T+;40GB(?H*yWMAZ-``_*e|R_d~@}b zcPza!RGVGD`Qt>8z4Pv1^*u-Q*}3*efL?z!Y^kQjR0ksk;$vLvv{#+63bg|LoJ93iAJM|vY1pr z#y5X)sUQLPg*L0NvWwfTJb9+63+Zy9PoTA2KzeN+WNLXq?(tU_2}vf0yAp5l52p1* z+mdZB^0;_=jDVe1(_3ht&hY0-j5eC(DU{HR<36y~o!!_x&iZfuJA_{_mEU9AWUUr zBgW_I!d=}VU3w&My`e#-Y5PhrU9(!`D56M>;}n-%Jak#+e{Ge}`Qb??shHd*cf?Sh zU4L$vB+`ly$;r{NiyS&+*lXh4+n?lLY22HZF0~(MTHp!salP&qmaOfwBNjL5hkV14tv8{-*&4JY30ft zQC0}Kr*u;^3RpiEEpiTf6BjdVsr^UAOIKoJ$?Q0{fqfjBi)#Q80RREC9z$qyX>)XM zaA+V#Wn*g~JY!~MV{1TbWMwXIa%Vn?0Zs%H0SEv%79j-kGIiv?5U;`CX%wd0($0xK zEgXjh0$EX{Mw77*8-D-_2@u=T&WS!P9EW*l2mB30+1^wyY6r5i$f8mrSjnMz8Y^+9 zKG1k2msyNa4sCq#{w-YKu2T#fxHST4G9FE8XPPX|wbX-Q|J%>pIA7LQQQ$$uhOf4e zYn2ceenhD(05I z7FQ$*Uwa2i6UWq8=9!B=*(IwWx%aI}d$NZ}g=%V&e;bh3`zOu| zQ|xo=$bTdis&<}zlh$;MS3wA8)|7WmrW}s|b%%a64 z53A>GNbf>23V-xl6xZ*}08T{4&K_t>0)jFIxd9CXSy7}$0SExgl%4Zmt=xRZe#wo= zx-e-0{fDVtT&%89@liy&tG>4Mmr|8gr$UcL6z_KIWJ***%K*!l;Pvd?9mHv4t zE{As`oojkypzerLlLSiv+zIaxt~R!xgsJTo9)C9*ntxvwl_8C0y7pU43kXLkEZQ)H zrAi9pc6@feKS20FvfC^N$1@DUHBSyJ?SGNNF>6Ag$h2Gfe?UldOcCR)q=d0By|vLd zS@W~*n9=$PY><-OP}vLH9J0F1RKGvv9TEgd&;7>e@tm%&ikFsxJKy9r^ zN-vhXqkoaNP48HT0iZagYFb&`v!+Xk<$4}*v;^((boVFI*8mX#00D^sHUt;}2ml}! zAq4U=b>zPgufgAG6sFtK&WS!P9ESx0Sy7}$0vikf3JDO~($0xKEgXkw69@o~SZO!L zc>v}|PYBq%^R(dy|8@oIcMS;t)u-ivv|q}v$$yL%ky4>C$u!8jr{1`fb`wne&v^{X z&0X5cBqOWf$FrfunTdPe=`)mJoa~_G${V0UIl2O)ZK|cfS1B5c8O4vt-`Q(W8eL(k znY%bS|v98{7aL68cnGQwrGAnL0JiK=7X={#;jGuS(5x zT3@KEDyEnLW{Qe8eA44yI=D#hxVs?&U5XgsY<-+hvRy?U%E~ z2+#9+dbO*F)->-IEF-%uaeF4|?U15jXUZJ?o%VAU;lS3z$W?#Y=QSiJ zo%rN5yd#%%xO+ngP;t@n)4HDo1JLtH5n=8~Z3FOgHyIy7Fz|L|xK`rNNw}}0vJ+Q3 zh9Di>Evd!oP(=5&CtVnlL8@$^KfF}}FZi@q(2cy@4UupNa0P>Yy)9Vp9^4oEjs_&2 z_XaqU4m6a|L?49)o*d%p(b#|e4HYFQ(~JHLti_hA0twdJ9$D1B^lPlJ7XoUrY;8{> z6)SGRqj0Zy`2$n77!NM6)ihJQEPNLj6Obmx!udS)#M2AQsuu4jkuw&&h5}fd#&RH( zXcJW5*9{;?R88R-JtfU?g{8XGpP%7Q@G&l8L;#EC(4j=@*jGp!s|OxQSakL>Mzm>T dFhI7^_lb;rB8RGZhpD!NUE`BDuCxCUPXtYPO@06X 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.01.95.tar.xz b/kiten-24.01.95.tar.xz new file mode 100644 index 0000000..a7aba2d --- /dev/null +++ b/kiten-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e82b923c7a711f9c8400905c6feb465ed26446dba4f9dcaf1ce5e86e32360c7 +size 11331788 diff --git a/kiten-24.01.95.tar.xz.sig b/kiten-24.01.95.tar.xz.sig new file mode 100644 index 0000000..44b1dc8 --- /dev/null +++ b/kiten-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44SYACgkQOmpNuDnq +ptcqMBAAhxtGryFC+c5tAqLJKZqyAbs/iIi0ZFN/U3pZlWNzAo+z0j/nY/ndGPlC +k/WvA3ci+UW/EmdyGBIsXayR666y3vtKEKJGSPfg+yqxKS4Qi/I5WxcP6vtD56Wi +HWd9NMOoAUTTnIJEFg9qdjDekMxZHa73EkZp4CujPsBm15HGaew+71EniyGWPXng +ZSoNQhgMTGh37JFcekwV+BXO3VfPfC9+bLP2ncCIRGi8N0Msic+sVwbfRUH7agtS +uzAkPxyyqxLmrw4jMb/n7HQ9az6R95kOs2y+XmJeFHLt2vV4Brp/58T99AWsAYac +GhfIt2g142GBMLhkmfRmzn5aduBSuFR2bnYYo9I/HqOAFpuUi48W3w8pfIoeMD/Y +ZdxArIlLR575+WtkdgqeOWely26IPw5RO7iA7ZRbHim8Je3B+hQWWpkbZbGHbIGz +dSK5KYt+ryGBsRThvfbwVzHl3V0wdjA13rWPWca48cRftQo/yCz87BQLoAlt11W0 ++aTxEyQx6WdgVEt22bFlVhNasSSLOmwVkXH9PtyUT3/GrzQ6U+fTNUXrOaEXuPwu +P8fXFq9Pf3UOECFLLXryZwzNDmHFw7MrceZ5Hz58lvoAAHeSSFMmiSW0nuqWHJjU +A7n62ioo0A9YL39HXs/eFqRoakVRw6PR+mIXF9Ntzj5qkINJBYE= +=VMiD +-----END PGP SIGNATURE----- diff --git a/kiten.changes b/kiten.changes index 346b260..d16b906 100644 --- a/kiten.changes +++ b/kiten.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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..2a74d8e 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.01.95 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: 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: 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