[kdeedu] rebase patches

[Jaroslav Reznik]

commit bee90f8e65b01024e7c3d8ca9e8fb882f64457fe
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Tue Jul 26 20:51:34 2011 +0200

    rebase patches

 ...make.patch => kdeedu-4.7.0-kalgebra_cmake.patch |    6 +++---
 ..._cmake.patch => kdeedu-4.7.0-kmplot_cmake.patch |    6 +++---
 kdeedu.spec                                        |    8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/kdeedu-4.6.80-kalgebra_cmake.patch b/kdeedu-4.7.0-kalgebra_cmake.patch
similarity index 60%
rename from kdeedu-4.6.80-kalgebra_cmake.patch
rename to kdeedu-4.7.0-kalgebra_cmake.patch
index 73eadd7..3d6c2cc 100644
--- a/kdeedu-4.6.80-kalgebra_cmake.patch
+++ b/kdeedu-4.7.0-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.95/kalgebra-4.6.95/src/CMakeLists.txt.kmplot_cmake	2011-06-09 11:14:08.000000000 +0200
-+++ ./kdeedu-4.6.95/kalgebra-4.6.95/src/CMakeLists.txt	2011-06-09 11:14:33.000000000 +0200
+diff -up kdeedu-4.7.0/kalgebra-4.7.0/src/CMakeLists.txt.kalgebra_cmake kdeedu-4.7.0/kalgebra-4.7.0/src/CMakeLists.txt
+--- kdeedu-4.7.0/kalgebra-4.7.0/src/CMakeLists.txt.kalgebra_cmake	2011-05-20 22:33:50.000000000 +0200
++++ kdeedu-4.7.0/kalgebra-4.7.0/src/CMakeLists.txt	2011-07-26 20:40:58.365523658 +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.7.0-kmplot_cmake.patch
similarity index 56%
rename from kdeedu-4.6.80-kmplot_cmake.patch
rename to kdeedu-4.7.0-kmplot_cmake.patch
index 424bff2..86565f0 100644
--- a/kdeedu-4.6.80-kmplot_cmake.patch
+++ b/kdeedu-4.7.0-kmplot_cmake.patch
@@ -1,6 +1,6 @@
-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.95/kmplot-4.6.95/CMakeLists.txt.kalgebra_cmake	2011-06-08 13:25:49.000000000 +0200
-+++ ./kdeedu-4.6.95/kmplot-4.6.95/CMakeLists.txt	2011-06-08 13:26:03.000000000 +0200
+diff -up kdeedu-4.7.0/kmplot-4.7.0/CMakeLists.txt.kmplot_cmake kdeedu-4.7.0/kmplot-4.7.0/CMakeLists.txt
+--- kdeedu-4.7.0/kmplot-4.7.0/CMakeLists.txt.kmplot_cmake	2011-05-20 22:34:09.000000000 +0200
++++ kdeedu-4.7.0/kmplot-4.7.0/CMakeLists.txt	2011-07-26 20:48:12.146485558 +0200
 @@ -2,7 +2,7 @@ project(kmplot)
  
  find_package(KDE4 REQUIRED)
diff --git a/kdeedu.spec b/kdeedu.spec
index 1ed88f0..7468883 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -39,10 +39,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## CMake patches
 
 # find qtmmlwidget library from libkdeedu
-Patch1: kdeedu-4.6.80-kalgebra_cmake.patch
+Patch1: kdeedu-4.7.0-kalgebra_cmake.patch
 
 # fix out of source build
-Patch2: kdeedu-4.6.80-kmplot_cmake.patch
+Patch2: kdeedu-4.7.0-kmplot_cmake.patch
 
 ## upstreamable patches
 
@@ -216,8 +216,8 @@ Group:   System Environment/Libraries
 # 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
+%patch1 -p1 -b .kalgebra_cmake
+%patch2 -p1 -b .kmplot_cmake
 
 # create CMakeLists.txt with list of all subdirectories with kdeedu apps
 ls -d */ | sed 's/\(.*\)/add_subdirectory( \1 )/g' > CMakeLists.txt