From 518dfda9de4e49ce3e255b3ec180a42b12549ad59a9c0dbf09773fbd6e8dd636 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 24 Nov 2018 23:44:50 +0000 Subject: [PATCH 1/5] KDE Applications 18.12.0 Beta (last try; fix any other issue post acceptance) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kiten?expand=0&rev=81 --- kiten-18.08.3.tar.xz | 3 --- kiten-18.11.80.tar.xz | 3 +++ kiten.changes | 24 ++++++++++++++++++++++++ kiten.spec | 31 ++++++++++++++----------------- 4 files changed, 41 insertions(+), 20 deletions(-) delete mode 100644 kiten-18.08.3.tar.xz create mode 100644 kiten-18.11.80.tar.xz diff --git a/kiten-18.08.3.tar.xz b/kiten-18.08.3.tar.xz deleted file mode 100644 index b15b8fe..0000000 --- a/kiten-18.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48d1b510d761b521c3c783ee27acc39c5bf1ede6b68aa42d76e10c160f0577a4 -size 11553800 diff --git a/kiten-18.11.80.tar.xz b/kiten-18.11.80.tar.xz new file mode 100644 index 0000000..cc3bc84 --- /dev/null +++ b/kiten-18.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8b72a354b3025b5159ecc0d95bbc769422da1c8fbb4c3fbcd265d1fab7f3c93 +size 11555712 diff --git a/kiten.changes b/kiten.changes index c62a53c..a6da9cf 100644 --- a/kiten.changes +++ b/kiten.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Nov 20 06:22:26 UTC 2018 - Luca Beltrame + +- Run spec-cleaner + +------------------------------------------------------------------- +Tue Nov 20 05:57:05 UTC 2018 - lbeltrame@kde.org + +- Update to 18.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.11.80.php +- Changes since 18.08.3: + * Add donation url to appdata + * Add caption to the screenshot + * Sync the declaration and implementation + * Fix minor EBN issues + * Fix the compilation of kiten on Windows + * Port to KStatusNotifierItem and fix zorder issue + * Fix logical not is only applied to the left hand side of this comparison + * Port away from deprecated KAboutData::setProgramIconName() + * Fix minor EBN issues and typos + * added arcconfig + ------------------------------------------------------------------- Thu Nov 08 20:43:38 UTC 2018 - lbeltrame@kde.org diff --git a/kiten.spec b/kiten.spec index a6aedd6..8ae4de1 100644 --- a/kiten.spec +++ b/kiten.spec @@ -1,7 +1,7 @@ # # spec file for package kiten # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,23 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%bcond_without lang - -Name: kiten -Version: 18.08.3 -Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang +Name: kiten +Version: 18.11.80 +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+ and CC-BY-SA-3.0 and CC-BY-SA-4.0 +License: GPL-2.0-or-later AND CC-BY-SA-3.0 AND CC-BY-SA-4.0 Group: Amusements/Teaching/Language -Url: http://edu.kde.org +URL: http://edu.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: karchive-devel @@ -41,6 +40,7 @@ BuildRequires: kdoctools-devel BuildRequires: kf5-filesystem BuildRequires: khtml-devel BuildRequires: ki18n-devel +BuildRequires: knotifications-devel BuildRequires: kxmlgui-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -53,14 +53,13 @@ Provides: %{name}5 = %{version} %if %{with lang} Recommends: %{name}-lang %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Kiten is a tool to learn Japanese. %package devel Summary: Development files for kiten -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/KDE Requires: kiten = %{version} @@ -106,7 +105,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %kf5_makeinstall -C build %if %{with lang} %find_lang %{name} --with-man --all-name - %kf5_find_htmldocs + %{kf5_find_htmldocs} %endif %reconfigure_fonts_scriptlets -n fonts-KanjiStrokeOrders @@ -115,8 +114,8 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc COPYING* AUTHORS README +%license COPYING* +%doc AUTHORS README %dir %{_kf5_appstreamdir} %doc %lang(en) %{_kf5_htmldir}/en/kiten/ %{_kf5_applicationsdir}/org.kde.kiten.desktop @@ -134,19 +133,17 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_kf5_sharedir}/kxmlgui5/ %files devel -%defattr(-,root,root) %{_kf5_libdir}/libkiten.so %{_kf5_prefix}/include/libkiten/ %files -n fonts-KanjiStrokeOrders -%defattr(-,root,root) %doc data/font/copyright.txt data/font/readme_*.txt %dir %{_kf5_sharedir}/fonts/kanjistrokeorders/ %{_kf5_sharedir}/fonts/kanjistrokeorders/KanjiStrokeOrders.ttf %if %{with lang} %files lang -f %{name}.lang -%doc COPYING* +%license COPYING* %endif %changelog From d3187ea322c47a06734532dec3eed4ac7c755ea043660f29cc3d19f9bc93a1f6 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 26 Nov 2018 06:01:29 +0000 Subject: [PATCH 2/5] Accepting request 651896 from home:jengelh:branches:KDE:Applications - Unbundle the dictionary files and instead make symlinks to the edict package's files. OBS-URL: https://build.opensuse.org/request/show/651896 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kiten?expand=0&rev=82 --- kiten.changes | 6 ++++++ kiten.spec | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/kiten.changes b/kiten.changes index a6da9cf..ff14d83 100644 --- a/kiten.changes +++ b/kiten.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 26 02:42:35 UTC 2018 - Jan Engelhardt + +- Unbundle the dictionary files and instead make symlinks to + the edict package's files. + ------------------------------------------------------------------- Tue Nov 20 06:22:26 UTC 2018 - Luca Beltrame diff --git a/kiten.spec b/kiten.spec index 8ae4de1..44d6219 100644 --- a/kiten.spec +++ b/kiten.spec @@ -29,6 +29,7 @@ License: GPL-2.0-or-later AND CC-BY-SA-3.0 AND CC-BY-SA-4.0 Group: Amusements/Teaching/Language URL: http://edu.kde.org Source0: %{name}-%{version}.tar.xz +BuildRequires: edict BuildRequires: extra-cmake-modules BuildRequires: karchive-devel BuildRequires: kcompletion-devel @@ -53,6 +54,7 @@ Provides: %{name}5 = %{version} %if %{with lang} Recommends: %{name}-lang %endif +Requires: edict %description Kiten is a tool to learn Japanese. @@ -107,6 +109,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %find_lang %{name} --with-man --all-name %{kf5_find_htmldocs} %endif + for i in edict kanjidic radkfile; do + test -e "%{_datadir}/edict/$i" && ln -fsv "%{_datadir}/edict/$i" "%{buildroot}/%{_datadir}/kiten/$i" + done %reconfigure_fonts_scriptlets -n fonts-KanjiStrokeOrders From c0aa6025723584547edc8b14619ad75bbd9d0ebce07976730cf8414ac2ace262 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 4 Dec 2018 16:22:35 +0000 Subject: [PATCH 3/5] KDE Applications 18.12.0 RC (knights is already in K:A) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kiten?expand=0&rev=83 --- kiten-18.11.80.tar.xz | 3 --- kiten-18.11.90.tar.xz | 3 +++ kiten.changes | 10 ++++++++++ kiten.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 kiten-18.11.80.tar.xz create mode 100644 kiten-18.11.90.tar.xz diff --git a/kiten-18.11.80.tar.xz b/kiten-18.11.80.tar.xz deleted file mode 100644 index cc3bc84..0000000 --- a/kiten-18.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8b72a354b3025b5159ecc0d95bbc769422da1c8fbb4c3fbcd265d1fab7f3c93 -size 11555712 diff --git a/kiten-18.11.90.tar.xz b/kiten-18.11.90.tar.xz new file mode 100644 index 0000000..4bf3677 --- /dev/null +++ b/kiten-18.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c71cba350dde5b900b671445bba2d53ab5aa21f5ae9b9a36af788a7a67f01c96 +size 11555852 diff --git a/kiten.changes b/kiten.changes index ff14d83..359943c 100644 --- a/kiten.changes +++ b/kiten.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 03 20:56:02 UTC 2018 - lbeltrame@kde.org + +- Update to 18.11.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-rc.php +- Changes since 18.11.80: + * No code changes since 18.11.80 + ------------------------------------------------------------------- Mon Nov 26 02:42:35 UTC 2018 - Jan Engelhardt diff --git a/kiten.spec b/kiten.spec index 44d6219..b6ec004 100644 --- a/kiten.spec +++ b/kiten.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kiten -Version: 18.11.80 +Version: 18.11.90 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) From d316521610c7473b99e606b8b5ba7d527fc2ea4ea0f288f21ee804ade854c012 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 16:50:53 +0000 Subject: [PATCH 4/5] KDE Applications 18.12.0 (not yet built) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kiten?expand=0&rev=84 --- kiten-18.11.90.tar.xz | 3 --- kiten-18.12.0.tar.xz | 3 +++ kiten.changes | 10 ++++++++++ kiten.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 kiten-18.11.90.tar.xz create mode 100644 kiten-18.12.0.tar.xz diff --git a/kiten-18.11.90.tar.xz b/kiten-18.11.90.tar.xz deleted file mode 100644 index 4bf3677..0000000 --- a/kiten-18.11.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c71cba350dde5b900b671445bba2d53ab5aa21f5ae9b9a36af788a7a67f01c96 -size 11555852 diff --git a/kiten-18.12.0.tar.xz b/kiten-18.12.0.tar.xz new file mode 100644 index 0000000..eafd612 --- /dev/null +++ b/kiten-18.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8caeab2d0c9c56067870777023b410260aea2e6fb33eb69f79a9fcc21c8b6ad2 +size 11554352 diff --git a/kiten.changes b/kiten.changes index 359943c..9de5ae8 100644 --- a/kiten.changes +++ b/kiten.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 14 06:09:12 UTC 2018 - lbeltrame@kde.org + +- Update to 18.12.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.0.php +- Changes since 18.11.90: + * No code changes since 18.11.90 + ------------------------------------------------------------------- Mon Dec 03 20:56:02 UTC 2018 - lbeltrame@kde.org diff --git a/kiten.spec b/kiten.spec index b6ec004..cc55593 100644 --- a/kiten.spec +++ b/kiten.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kiten -Version: 18.11.90 +Version: 18.12.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) From 4b058fa41862b905a787aa555979e706ba83b8788ca4ad40f26645bff8052f32 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 22:19:03 +0000 Subject: [PATCH 5/5] Fix wrong beta and rc release announcement URLs OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kiten?expand=0&rev=85 --- kiten.changes | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kiten.changes b/kiten.changes index 9de5ae8..07a8f1f 100644 --- a/kiten.changes +++ b/kiten.changes @@ -35,7 +35,7 @@ Tue Nov 20 05:57:05 UTC 2018 - lbeltrame@kde.org - Update to 18.11.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.11.80.php + * https://www.kde.org/announcements/announce-applications-18.12-beta.php - Changes since 18.08.3: * Add donation url to appdata * Add caption to the screenshot @@ -94,7 +94,7 @@ Thu Jul 26 13:00:45 UTC 2018 - lbeltrame@kde.org - Update to 18.07.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.07.80.php + * https://www.kde.org/announcements/announce-applications-18.08-beta.php - Changes since 18.04.3: * Fix warning @@ -144,7 +144,7 @@ Fri Apr 06 07:09:34 CEST 2018 - lbeltrame@kde.org - Update to 18.03.90 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.03.90.php + * https://www.kde.org/announcements/announce-applications-18.04-rc.php - Changes since 17.12.3: * None @@ -256,7 +256,7 @@ Sat Aug 5 18:17:58 UTC 2017 - christophe@krop.fr - Update to KDE Applications 17.07.90 * KDE Applications 17.07.90 - * https://www.kde.org/announcements/announce-applications-17.07.90.php + * https://www.kde.org/announcements/announce-applications-17.08-rc.php ------------------------------------------------------------------- @@ -315,7 +315,7 @@ Sat Mar 25 23:10:31 CET 2017 - lbeltrame@kde.org - Update to 17.03.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-17.03.80.php + * https://www.kde.org/announcements/announce-applications-17.04-beta.php - Changes since 16.12.3: * None @@ -402,7 +402,7 @@ Mon Aug 8 15:07:22 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 16.07.90 * KDE Applications 16.07.90 (16.08-RC) - * https://www.kde.org/announcements/announce-applications-16.07.90.php + * https://www.kde.org/announcements/announce-applications-16.08-rc.php ------------------------------------------------------------------- @@ -518,7 +518,7 @@ Fri Aug 7 06:55:28 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.07.90 * KDE Applications 15.08.0 RC1 - * https://www.kde.org/announcements/announce-applications-15.07.90.php + * https://www.kde.org/announcements/announce-applications-15.08-rc.php -------------------------------------------------------------------