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/kig-4.6.95.tar.bz2 b/kig-4.6.95.tar.bz2 deleted file mode 100644 index 791d3a0..0000000 --- a/kig-4.6.95.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4fe396e786c4b52779cde54b78c338690797e60d3b814c549b45f4862699d59 -size 1605197 diff --git a/kig-4.7.0.tar.bz2 b/kig-4.7.0.tar.bz2 new file mode 100644 index 0000000..9e1d4f6 --- /dev/null +++ b/kig-4.7.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aeb8877bebc82b7fdd3639ae52fd4c3bb4e108cfbb8c927feb3d0ff2381ad31a +size 1605731 diff --git a/kig.changes b/kig.changes index 84bfbbe..fdb0e23 100644 --- a/kig.changes +++ b/kig.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jul 22 20:24:11 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:57:44 CEST 2011 - dmueller@suse.de diff --git a/kig.spec b/kig.spec index 0d97025..655bd01 100644 --- a/kig.spec +++ b/kig.spec @@ -18,39 +18,49 @@ Name: kig -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: Productivity/Scientific/Math Summary: Interactive Geometry 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: Productivity/Scientific/Math +Source0: %{name}-%{version}.tar.bz2 +BuildRequires: fdupes Requires: libkeduvocdocument4 Suggests: libkeduvocdocument4 Provides: kde4-kig = 4.3.0 Obsoletes: kde4-kig < 4.3.0 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%kde4_runtime_requires %description Kig is an application for Interactive Geometry. It's intended to serve @@ -58,33 +68,27 @@ two purposes: Allow students to interactively explore mathematical figures and concepts using the computer. Serve as a WYSIWYG tool for drawing mathematical figures and including them in other documents. - -Authors: --------- - The KDE Team - %prep -%setup -q -n %{name}-%version -%patch0 -p0 +%setup -q %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 Math %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