[kdeedu] cleanup
Than Ngo
than at fedoraproject.org
Wed Jun 29 16:29:29 UTC 2011
commit 709c8fce7ad5719396249d64e408939d6e816f5b
Author: Than Ngo <than at redhat.com>
Date: Wed Jun 29 18:28:04 2011 +0200
cleanup
kdeedu-4.6.80-kalgebra_cmake.patch | 4 +-
kdeedu-4.6.80-kmplot_cmake.patch | 6 ++--
kdeedu.spec | 51 +++++++++++++++++++-----------------
3 files changed, 32 insertions(+), 29 deletions(-)
---
diff --git a/kdeedu-4.6.80-kalgebra_cmake.patch b/kdeedu-4.6.80-kalgebra_cmake.patch
index 2d5d7ea..b62b8fa 100644
--- a/kdeedu-4.6.80-kalgebra_cmake.patch
+++ b/kdeedu-4.6.80-kalgebra_cmake.patch
@@ -1,6 +1,6 @@
diff -up ./kdeedu-4.6.80/kalgebra-4.6.80/src/CMakeLists.txt.kmplot_cmake ./kdeedu-4.6.80/kalgebra-4.6.80/src/CMakeLists.txt
---- ./kdeedu-4.6.80/kalgebra-4.6.80/src/CMakeLists.txt.kmplot_cmake 2011-06-09 11:14:08.000000000 +0200
-+++ ./kdeedu-4.6.80/kalgebra-4.6.80/src/CMakeLists.txt 2011-06-09 11:14:33.000000000 +0200
+--- ./kdeedu-4.6.90/kalgebra-4.6.90/src/CMakeLists.txt.kmplot_cmake 2011-06-09 11:14:08.000000000 +0200
++++ ./kdeedu-4.6.90/kalgebra-4.6.90/src/CMakeLists.txt 2011-06-09 11:14:33.000000000 +0200
@@ -27,7 +27,7 @@ endif(OPENGL_FOUND)
kde4_add_app_icon(kalgebra_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-kalgebra.png")
diff --git a/kdeedu-4.6.80-kmplot_cmake.patch b/kdeedu-4.6.80-kmplot_cmake.patch
index 1650120..3dc34c3 100644
--- a/kdeedu-4.6.80-kmplot_cmake.patch
+++ b/kdeedu-4.6.80-kmplot_cmake.patch
@@ -1,6 +1,6 @@
-diff -up ./kdeedu-4.6.80/kmplot-4.6.80/CMakeLists.txt.kalgebra_cmake ./kdeedu-4.6.80/kmplot-4.6.80/CMakeLists.txt
---- ./kdeedu-4.6.80/kmplot-4.6.80/CMakeLists.txt.kalgebra_cmake 2011-06-08 13:25:49.000000000 +0200
-+++ ./kdeedu-4.6.80/kmplot-4.6.80/CMakeLists.txt 2011-06-08 13:26:03.000000000 +0200
+diff -up ./kdeedu-4.6.90/kmplot-4.6.90/CMakeLists.txt.kalgebra_cmake ./kdeedu-4.6.90/kmplot-4.6.90/CMakeLists.txt
+--- ./kdeedu-4.6.90/kmplot-4.6.90/CMakeLists.txt.kalgebra_cmake 2011-06-08 13:25:49.000000000 +0200
++++ ./kdeedu-4.6.90/kmplot-4.6.90/CMakeLists.txt 2011-06-08 13:26:03.000000000 +0200
@@ -2,7 +2,7 @@ project(kmplot)
find_package(KDE4 REQUIRED)
diff --git a/kdeedu.spec b/kdeedu.spec
index 3a43874..808aea2 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -1,4 +1,3 @@
-
# The Kalzium solver needs OCaml with native compilation support (ocamlopt) and
# ocaml-facile.
%ifarch alpha %{ix86} ia64 x86_64 ppc ppc64 sparc sparcv9
@@ -13,26 +12,27 @@ Release: 1%{?dist}
License: GPLv2
Group: Amusements/Games
URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/blinken-%{version}.tar.bz2
-Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/cantor-%{version}.tar.bz2
-Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kalgebra-%{version}.tar.bz2
-Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kalzium-%{version}.tar.bz2
-Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kanagram-%{version}.tar.bz2
-Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kbruch-%{version}.tar.bz2
-Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kgeography-%{version}.tar.bz2
-Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/khangman-%{version}.tar.bz2
-Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kig-%{version}.tar.bz2
-Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kiten-%{version}.tar.bz2
-Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/klettres-%{version}.tar.bz2
-Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kmplot-%{version}.tar.bz2
-Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kstars-%{version}.tar.bz2
-Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/ktouch-%{version}.tar.bz2
-Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kturtle-%{version}.tar.bz2
-Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kwordquiz-%{version}.tar.bz2
-Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/marble-%{version}.tar.bz2
-Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/parley-%{version}.tar.bz2
-Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/rocs-%{version}.tar.bz2
-Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/step-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libkdeedu-%{version}.tar.bz2
+Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/blinken-%{version}.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/cantor-%{version}.tar.bz2
+Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kalgebra-%{version}.tar.bz2
+Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kalzium-%{version}.tar.bz2
+Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kanagram-%{version}.tar.bz2
+Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kbruch-%{version}.tar.bz2
+Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kgeography-%{version}.tar.bz2
+Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/khangman-%{version}.tar.bz2
+Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kig-%{version}.tar.bz2
+Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kiten-%{version}.tar.bz2
+Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/klettres-%{version}.tar.bz2
+Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kmplot-%{version}.tar.bz2
+Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kstars-%{version}.tar.bz2
+Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/ktouch-%{version}.tar.bz2
+Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kturtle-%{version}.tar.bz2
+Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kwordquiz-%{version}.tar.bz2
+Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/marble-%{version}.tar.bz2
+Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/parley-%{version}.tar.bz2
+Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/rocs-%{version}.tar.bz2
+Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/step-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,7 +52,6 @@ Obsoletes: kdeedu4 < %{version}-%{release}
Provides: kdeedu4 = %{version}-%{release}
BuildRequires: attica-devel
-# FIXME: this links libGLEW too, probably shouldn't -- Rex
BuildRequires: avogadro-devel >= 1.0.1
# Kig can optionally use Boost.Python for Python scripting
BuildRequires: boost-devel
@@ -211,7 +210,11 @@ Group: System Environment/Libraries
%prep
-%setup -q -T -D -c -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -n kdeedu-%{version}%{?alphatag}
+# unpack libkdeedu
+%setup -q -n libkdeedu-%{version}
+
+# unpack the kdeedu applications
+%setup -q -T -D -c -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -n kdeedu-%{version}%{?alphatag}
%patch1 -p2 -b .kalgebra_cmake
%patch2 -p2 -b .kmplot_cmake
@@ -669,7 +672,7 @@ rm -rf %{buildroot}
%changelog
-* Tue Jun 28 2011 Than Ngo <than at redhat.com> - 4.6.90-1
+* Wed Jun 29 2011 Than Ngo <than at redhat.com> - 4.6.90-1
- 4.6.90 (rc1)
* Tue Jun 21 2011 Rex Dieter <rdieter at fedorparoject.org> 4.6.80-2
More information about the scm-commits
mailing list