From f035c32ea75a982ca963ab6c6517d3768663c6cdf8f5fa6775f4023d73bbb958 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 7 Jan 2013 10:03:18 +0000 Subject: [PATCH] Accepting request 147036 from KDE:Distro:Factory Update KDE to KDE 4.10 RC2 OBS-URL: https://build.opensuse.org/request/show/147036 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kiten?expand=0&rev=25 --- kiten-4.9.95.tar.xz | 3 --- kiten-4.9.97.tar.xz | 3 +++ kiten.changes | 12 ++++++++++++ kiten.spec | 41 ++++++++--------------------------------- 4 files changed, 23 insertions(+), 36 deletions(-) delete mode 100644 kiten-4.9.95.tar.xz create mode 100644 kiten-4.9.97.tar.xz diff --git a/kiten-4.9.95.tar.xz b/kiten-4.9.95.tar.xz deleted file mode 100644 index 3441960..0000000 --- a/kiten-4.9.95.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c664d2c65f3441958e0dcbcc6d9e4f00dafe631feba0a9de59e456828f6afd2 -size 11746556 diff --git a/kiten-4.9.97.tar.xz b/kiten-4.9.97.tar.xz new file mode 100644 index 0000000..16607c0 --- /dev/null +++ b/kiten-4.9.97.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93e9588d1d32d715e666a491dcc95efd4fdace8e2cdc80f993a04070425397d1 +size 11747000 diff --git a/kiten.changes b/kiten.changes index 524455f..559f2e0 100644 --- a/kiten.changes +++ b/kiten.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jan 3 21:13:36 UTC 2013 - tittiatcoke@gmail.com + +- Update to 4.9.97 + * This is the second RC release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Wed Jan 2 21:27:25 UTC 2013 - asterios.dramis@gmail.com + +- Updated build requirements. +- Removed unneeded runtime requirement for libkeduvocdocument4. + ------------------------------------------------------------------- Wed Dec 19 18:40:47 UTC 2012 - tittiatcoke@gmail.com diff --git a/kiten.spec b/kiten.spec index 3071121..1c49f06 100644 --- a/kiten.spec +++ b/kiten.spec @@ -1,7 +1,7 @@ # # spec file for package kiten # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,35 +17,16 @@ Name: kiten -BuildRequires: boost-devel -BuildRequires: freeglut-devel -BuildRequires: gsl-devel -BuildRequires: kdebase4-workspace-devel -BuildRequires: libeigen2-devel -BuildRequires: libgmm++-devel -BuildRequires: libkdeedu4-devel -BuildRequires: libopenbabel-devel -BuildRequires: libqalculate-devel -BuildRequires: libspectre-devel -BuildRequires: python-qt4-devel -BuildRequires: readline-devel -BuildRequires: xz - -# currently in DOESNOTBUILD (2008-07-03) -%ifnarch ppc ppc64 s390 s390x -BuildRequires: ocaml -BuildRequires: ocaml-facile -%endif -Version: 4.9.95 +Version: 4.9.97 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: fdupes +BuildRequires: libkde4-devel +BuildRequires: xz Requires: fonts-KanjiStrokeOrders -Requires: libkeduvocdocument4 >= %version Provides: kde4-kiten = 4.3.0 Obsoletes: kde4-kiten < 4.3.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -86,9 +67,8 @@ also hope it will help teachers of Japanese in the preparation of classroom material. Beware that Japanese stroke order can differ from the stroke order used in other languages that use Chinese characters. - %prep -%setup -q -n %{name}-%{version} +%setup -q %build %ifarch ppc ppc64 @@ -98,14 +78,11 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %make_jobs %install - cd build - %kde4_makeinstall + %kde4_makeinstall -C build %suse_update_desktop_file %{name} Education Languages %suse_update_desktop_file %{name}kanjibrowser Education Languages %suse_update_desktop_file %{name}radselect Education Languages - %kde_post_install - %fdupes -s %{buildroot} %if %suse_version > 1220 %reconfigure_fonts_scriptlets -n fonts-KanjiStrokeOrders @@ -124,8 +101,6 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %files %defattr(-,root,root) -%dir %_kde4_appsdir/kitenkanjibrowser -%dir %{_prefix}/share/fonts/kanjistrokeorders %{_kde4_applicationsdir}/kitenkanjibrowser.desktop %{_kde4_applicationsdir}/kitenradselect.desktop %_kde4_bindir/kiten @@ -134,7 +109,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %_kde4_bindir/kitenradselect %_kde4_libdir/libkiten.so.* %_kde4_applicationsdir/kiten.desktop -%_kde4_appsdir/kitenkanjibrowser/kanjibrowserui.rc +%_kde4_appsdir/kitenkanjibrowser/ %_kde4_htmldir/en/kiten/ %_kde4_iconsdir/hicolor/*/apps/kiten.* %_kde4_appsdir/kiten/ @@ -144,7 +119,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %files devel %defattr(-,root,root) %_kde4_libdir/libkiten.so -%{_includedir}/libkiten/ +%{_kde4_includedir}/libkiten/ %files -n fonts-KanjiStrokeOrders %defattr(-,root,root)