From 256e5b33560f4fc888af73a855a22424428cabf4a61aa056183d29a291f4fbc0 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 27 Jul 2011 15:27:42 +0000 Subject: [PATCH] Accepting request 77256 from KDE:Distro:Factory forward to factory OBS-URL: https://build.opensuse.org/request/show/77256 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kiten?expand=0&rev=3 --- 4_6_BRANCH.diff | 7 ----- kiten-4.6.95.tar.bz2 | 3 --- kiten-4.7.0.tar.bz2 | 3 +++ kiten.changes | 8 ++++++ kiten.spec | 62 +++++++++++++++++++++++--------------------- 5 files changed, 44 insertions(+), 39 deletions(-) delete mode 100644 4_6_BRANCH.diff delete mode 100644 kiten-4.6.95.tar.bz2 create mode 100644 kiten-4.7.0.tar.bz2 diff --git a/4_6_BRANCH.diff b/4_6_BRANCH.diff deleted file mode 100644 index 9d92079..0000000 --- a/4_6_BRANCH.diff +++ /dev/null @@ -1,7 +0,0 @@ -package: kdeedu-4.2.87svn969966.tar.bz2 -kdemod: kdeedu ---- BRANCH_STATUS -+++ BRANCH_STATUS -@@ -0,0 +1,2 @@ -+current HEAD: 970680 -+svn di between //trunk/KDE/kdeedu@969966 and //trunk/KDE/kdeedu diff --git a/kiten-4.6.95.tar.bz2 b/kiten-4.6.95.tar.bz2 deleted file mode 100644 index 22e242b..0000000 --- a/kiten-4.6.95.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6cbc8fe70c45a939a0d4a5239d4ec6003de61b19a6e033addb88d47711cfbcf6 -size 4019214 diff --git a/kiten-4.7.0.tar.bz2 b/kiten-4.7.0.tar.bz2 new file mode 100644 index 0000000..8a3c09a --- /dev/null +++ b/kiten-4.7.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3105bc087b64bd26e4ad1920a694e216797e1ae3fc4d326c8e5a44bb53b3085 +size 4021138 diff --git a/kiten.changes b/kiten.changes index 0eecea2..15dfefa 100644 --- a/kiten.changes +++ b/kiten.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jul 22 20:24:37 CEST 2011 - dmueller@suse.de + +- update to 4.7.0 + * Small fixes over KDE 4.7 RC2 + * see http://kde.org/announcements/4.7 for details + + ------------------------------------------------------------------- Sat Jul 9 09:58:11 CEST 2011 - dmueller@suse.de diff --git a/kiten.spec b/kiten.spec index 15001ba..b27fb81 100644 --- a/kiten.spec +++ b/kiten.spec @@ -18,70 +18,74 @@ Name: kiten -BuildRequires: boost-devel freeglut-devel kdebase4-workspace-devel -BuildRequires: gsl-devel libeigen2-devel libspectre-devel python-qt4-devel -BuildRequires: libgmm++-devel readline-devel -BuildRequires: libcfitsio-devel libindi-devel libqalculate-devel -BuildRequires: libopenbabel-devel +BuildRequires: boost-devel +BuildRequires: freeglut-devel +BuildRequires: gsl-devel +BuildRequires: kdebase4-workspace-devel +BuildRequires: libcfitsio-devel +BuildRequires: libeigen2-devel +BuildRequires: libgmm++-devel +BuildRequires: libindi-devel BuildRequires: libkdeedu4-devel +BuildRequires: libopenbabel-devel +BuildRequires: libqalculate-devel +BuildRequires: libspectre-devel +BuildRequires: python-qt4-devel +BuildRequires: readline-devel %if 0%{?sles_version} == 0 -BuildRequires: glew-devel python python-devel +BuildRequires: glew-devel +BuildRequires: python +BuildRequires: python-devel %if 0%{?suse_version} > 1120 BuildRequires: avogadro-devel %endif -%py_requires +%py_requires %endif # currently in DOESNOTBUILD (2008-07-03) %ifnarch ppc ppc64 s390 s390x -BuildRequires: ocaml ocaml-facile +BuildRequires: ocaml +BuildRequires: ocaml-facile %endif -BuildRequires: fdupes +Version: 4.7.0 +Release: 1 License: GPLv2+ -Group: Amusements/Teaching/Language Summary: Japanese Reference/Study Tool Url: http://edu.kde.org -Version: 4.6.95 -Release: 1 -Source0: %{name}-%version.tar.bz2 -Patch0: 4_6_BRANCH.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires +Group: Amusements/Teaching/Language +Source0: %{name}-%{version}.tar.bz2 +BuildRequires: fdupes Requires: libkeduvocdocument4 Suggests: libkeduvocdocument4 Provides: kde4-kiten = 4.3.0 Obsoletes: kde4-kiten < 4.3.0 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%kde4_runtime_requires %description Kiten is a tool to learn Japanese - -Authors: --------- - The KDE Team - %prep -%setup -q -n %{name}-%version -%patch0 -p0 +%setup -q -n %{name}-%{version} %build %ifarch ppc ppc64 -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" +export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif %cmake_kde4 -d build %make_jobs %install cd build - %makeinstall +%make_install %suse_update_desktop_file %{name} Education Languages %kde_post_install - %if %suse_version > 1020 - %fdupes -s $RPM_BUILD_ROOT + %if 0%{?suse_version} > 1020 + %fdupes -s %{buildroot} %endif %clean - rm -rf $RPM_BUILD_ROOT + rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -92,7 +96,7 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %_kde4_bindir/kiten %_kde4_bindir/kitengen %_kde4_bindir/kitenradselect -/usr/include/libkiten/ +%{_includedir}/libkiten/ %_kde4_libdir/libkiten.so* %_kde4_applicationsdir/kiten.desktop %_kde4_htmldir/en/kiten/