From e0ef8c5e0a5b25e3a29acae78b8e509721c822a9a95934afd07c4fc49ab29c07 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 11 May 2015 16:06:24 +0000 Subject: [PATCH] Accepting request 301268 from KDE:Applications Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/301268 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kiten?expand=0&rev=61 --- kiten-14.12.3.tar.xz | 3 -- kiten-15.04.0.tar.xz | 3 ++ kiten.changes | 22 ++++++++++++ kiten.spec | 80 +++++++++++++++++++++----------------------- 4 files changed, 63 insertions(+), 45 deletions(-) delete mode 100644 kiten-14.12.3.tar.xz create mode 100644 kiten-15.04.0.tar.xz diff --git a/kiten-14.12.3.tar.xz b/kiten-14.12.3.tar.xz deleted file mode 100644 index 4abd6f9..0000000 --- a/kiten-14.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d6fbc80f212e077cd4412bb7f078062d0cda484a9d4b1ff8aefdc6a1e02c547 -size 11679012 diff --git a/kiten-15.04.0.tar.xz b/kiten-15.04.0.tar.xz new file mode 100644 index 0000000..7974a46 --- /dev/null +++ b/kiten-15.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e60884a2334d1c265b4019c7cf622fb9e0a3153ebc504eec1ffe40f44e5fb52 +size 11678848 diff --git a/kiten.changes b/kiten.changes index 59c4a4a..b91af20 100644 --- a/kiten.changes +++ b/kiten.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sat Apr 11 13:16:40 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + + +------------------------------------------------------------------- +Sat Mar 21 18:10:22 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:45:39 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + ------------------------------------------------------------------- Tue Mar 3 10:39:50 UTC 2015 - tittiatcoke@gmail.com diff --git a/kiten.spec b/kiten.spec index 7cbebe7..dab5f75 100644 --- a/kiten.spec +++ b/kiten.spec @@ -17,20 +17,32 @@ Name: kiten -Version: 14.12.3 +Version: 15.04.0 Release: 0 Summary: Japanese Reference/Study Tool License: GPL-2.0+ Group: Amusements/Teaching/Language Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz -BuildRequires: libkde4-devel +BuildRequires: extra-cmake-modules +BuildRequires: karchive-devel +BuildRequires: kcompletion-devel +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdoctools-devel +BuildRequires: kf5-filesystem +BuildRequires: khtml-devel +BuildRequires: ki18n-devel +BuildRequires: kxmlgui-devel BuildRequires: xz +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: update-desktop-files Requires: fonts-KanjiStrokeOrders -Provides: kde4-kiten = 4.3.0 -Obsoletes: kde4-kiten < 4.3.0 +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Kiten is a tool to learn Japanese. @@ -52,10 +64,8 @@ License: BSD-3-Clause Group: System/X11/Fonts Provides: kdeedu4:%{_kde4_datadir}/fonts/kanjistrokeorders/KanjiStrokeOrders.ttf BuildArch: noarch -%if %suse_version > 1220 BuildRequires: fontpackages-devel %reconfigure_fonts_prereq -%endif %description -n fonts-KanjiStrokeOrders This font provides an easy way to view stroke order diagrams for over 6350 @@ -74,27 +84,14 @@ stroke order used in other languages that use Chinese characters. %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - %kde4_makeinstall -C build - #4.11: these should be upstream - %suse_update_desktop_file %{name}kanjibrowser Education Languages - %suse_update_desktop_file %{name}radselect Education Languages - %kde_post_install + %kf5_makeinstall -C build -%if %suse_version > 1220 %reconfigure_fonts_scriptlets -n fonts-KanjiStrokeOrders -%else -%post -n fonts-KanjiStrokeOrders -%run_suseconfig_fonts - -%postun -n fonts-KanjiStrokeOrders -%run_suseconfig_fonts -%endif - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -102,32 +99,31 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %files %defattr(-,root,root) %doc COPYING* AUTHORS README -%dir %{_kde4_datadir}/appdata -%{_kde4_applicationsdir}/kiten.desktop -%{_kde4_applicationsdir}/kitenkanjibrowser.desktop -%{_kde4_applicationsdir}/kitenradselect.desktop -%{_kde4_appsdir}/kiten/ -%{_kde4_appsdir}/kitenkanjibrowser/ -%{_kde4_appsdir}/kitenradselect/ -%{_kde4_bindir}/kiten -%{_kde4_bindir}/kitengen -%{_kde4_bindir}/kitenkanjibrowser -%{_kde4_bindir}/kitenradselect -%{_kde4_configkcfgdir}/kiten.kcfg -%{_kde4_datadir}/appdata/kiten.appdata.xml -%{_kde4_htmldir}/en/kiten/ -%{_kde4_iconsdir}/hicolor/*/apps/kiten.* -%{_kde4_libdir}/libkiten.so.* +%dir %{_kf5_sharedir}/appdata +%{_kf5_applicationsdir}/org.kde.kiten.desktop +%{_kf5_applicationsdir}/org.kde.kitenkanjibrowser.desktop +%{_kf5_applicationsdir}/kitenradselect.desktop +%{_kf5_sharedir}/kiten/ +%{_kf5_sharedir}/kxmlgui5/ +%{_kf5_bindir}/kiten +%{_kf5_bindir}/kitengen +%{_kf5_bindir}/kitenkanjibrowser +%{_kf5_bindir}/kitenradselect +%{_kf5_configkcfgdir}/ +%{_kf5_sharedir}/appdata/kiten.appdata.xml +%doc %{_kf5_htmldir}/en/kiten/ +%{_kf5_iconsdir}/hicolor/*/*/kiten.* +%{_kf5_libdir}/libkiten.so.* %files devel %defattr(-,root,root) -%_kde4_libdir/libkiten.so -%{_kde4_includedir}/libkiten/ +%{_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 %{_kde4_datadir}/fonts/kanjistrokeorders/ -%{_kde4_datadir}/fonts/kanjistrokeorders/KanjiStrokeOrders.ttf +%dir %{_kf5_sharedir}/fonts/kanjistrokeorders/ +%{_kf5_sharedir}/fonts/kanjistrokeorders/KanjiStrokeOrders.ttf %changelog