From 983a037c81fa0d4a2ea7a3de0f09a51b37f0a611b297f325aa6295c8bc82fbad Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christophe@krop.fr> Date: Sat, 5 Aug 2017 18:25:07 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kiten?expand=0&rev=58 --- kiten-17.04.3.tar.xz | 3 --- kiten-17.07.90.tar.xz | 3 +++ kiten.changes | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 kiten-17.04.3.tar.xz create mode 100644 kiten-17.07.90.tar.xz diff --git a/kiten-17.04.3.tar.xz b/kiten-17.04.3.tar.xz deleted file mode 100644 index f96e5e3..0000000 --- a/kiten-17.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffd798cf9dc9c6f440fda0f9500925ffd44f48c1b165f824544ba6c54600b2af -size 11555056 diff --git a/kiten-17.07.90.tar.xz b/kiten-17.07.90.tar.xz new file mode 100644 index 0000000..4914966 --- /dev/null +++ b/kiten-17.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2addcaa3be25c810351467620f6557a529347e9487b150348a21e9a8cf79fdc8 +size 11558908 diff --git a/kiten.changes b/kiten.changes index d7a6f77..29ab87b 100644 --- a/kiten.changes +++ b/kiten.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 + + ------------------------------------------------------------------- Sat Jul 15 22:59:58 CEST 2017 - lbeltrame@kde.org From 4dd4e6fb76290133fe73e2f012c49f76ce73ffa2da5ce1aa1789ecdf63e44961 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christophe@krop.fr> Date: Sat, 5 Aug 2017 18:50:34 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kiten?expand=0&rev=59 --- kiten.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kiten.spec b/kiten.spec index ec57037..f19f03a 100644 --- a/kiten.spec +++ b/kiten.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kiten -Version: 17.04.3 +Version: 17.07.90 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From 4375a7d7b166431750a5282927ec6dc2931dc1f0d2bed9bb8992910c57a867b2 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christophe@krop.fr> Date: Fri, 11 Aug 2017 22:56:51 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kiten?expand=0&rev=60 --- kiten.changes | 13 +++++++++++++ kiten.spec | 17 ++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/kiten.changes b/kiten.changes index 29ab87b..541e399 100644 --- a/kiten.changes +++ b/kiten.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Aug 11 22:45:37 UTC 2017 - christophe@krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * This include is not necessary and it breaks the window build + * Fix wayland support + * Use Q_DECLARE_OVERRIDE + * remove obsolete LSM file + * Port kde4_add_app_icon to ecm_add_app_icon + ------------------------------------------------------------------- Sat Aug 5 18:17:58 UTC 2017 - christophe@krop.fr diff --git a/kiten.spec b/kiten.spec index f19f03a..7f9666d 100644 --- a/kiten.spec +++ b/kiten.spec @@ -1,7 +1,7 @@ # # spec file for package kiten # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang Name: kiten Version: 17.07.90 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} 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) @@ -49,7 +50,9 @@ BuildRequires: pkgconfig(Qt5Widgets) Requires: fonts-KanjiStrokeOrders Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -115,20 +118,20 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %defattr(-,root,root) %doc COPYING* AUTHORS README %dir %{_kf5_appstreamdir} +%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_sharedir}/kiten/ -%{_kf5_sharedir}/kxmlgui5/ +%{_kf5_appstreamdir}/org.kde.kiten.appdata.xml %{_kf5_bindir}/kiten -%{_kf5_bindir}/kitenradselect %{_kf5_bindir}/kitengen %{_kf5_bindir}/kitenkanjibrowser +%{_kf5_bindir}/kitenradselect %{_kf5_configkcfgdir}/ -%{_kf5_appstreamdir}/org.kde.kiten.appdata.xml -%doc %{_kf5_htmldir}/en/kiten/ %{_kf5_iconsdir}/hicolor/*/*/kiten.* %{_kf5_libdir}/libkiten.so.* +%{_kf5_sharedir}/kiten/ +%{_kf5_sharedir}/kxmlgui5/ %files devel %defattr(-,root,root) From 8a69a006ddd62e9935e3220446992be75071a5e1333eccf1d77c9b054c5e8021 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christophe@krop.fr> Date: Fri, 11 Aug 2017 23:12:15 +0000 Subject: [PATCH 4/4] 17.08.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kiten?expand=0&rev=61 --- kiten-17.07.90.tar.xz | 3 --- kiten-17.08.0.tar.xz | 3 +++ kiten.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 kiten-17.07.90.tar.xz create mode 100644 kiten-17.08.0.tar.xz diff --git a/kiten-17.07.90.tar.xz b/kiten-17.07.90.tar.xz deleted file mode 100644 index 4914966..0000000 --- a/kiten-17.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2addcaa3be25c810351467620f6557a529347e9487b150348a21e9a8cf79fdc8 -size 11558908 diff --git a/kiten-17.08.0.tar.xz b/kiten-17.08.0.tar.xz new file mode 100644 index 0000000..fd23467 --- /dev/null +++ b/kiten-17.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7765021017748675ad58e69ee6e4a80218fc5455a278b0d3988bdbec3c738c8 +size 11555940 diff --git a/kiten.spec b/kiten.spec index 7f9666d..3cff3c0 100644 --- a/kiten.spec +++ b/kiten.spec @@ -19,7 +19,7 @@ %bcond_without lang Name: kiten -Version: 17.07.90 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)