[kdeedu] adapted

[Than Ngo]

commit 4efb6e1245aa1cd001e7e56277de8d566573dcca
Author: Than Ngo <than at redhat.com>
Date:   Wed Sep 7 15:14:35 2011 +0200

    adapted

 kdeedu-4.7.0-kmplot_cmake.patch                    |   12 ------------
 ...make.patch => kdeedu-4.7.1-kalgebra_cmake.patch |    6 +++---
 kdeedu-4.7.1-kmplot_cmake.patch                    |   12 ++++++++++++
 kdeedu.spec                                        |    4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/kdeedu-4.7.0-kalgebra_cmake.patch b/kdeedu-4.7.1-kalgebra_cmake.patch
similarity index 69%
rename from kdeedu-4.7.0-kalgebra_cmake.patch
rename to kdeedu-4.7.1-kalgebra_cmake.patch
index 3d6c2cc..b4ff5d0 100644
--- a/kdeedu-4.7.0-kalgebra_cmake.patch
+++ b/kdeedu-4.7.1-kalgebra_cmake.patch
@@ -1,6 +1,6 @@
-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
+diff -up kdeedu-4.7.1/kalgebra-4.7.1/src/CMakeLists.txt.kalgebra_cmake kdeedu-4.7.1/kalgebra-4.7.1/src/CMakeLists.txt
+--- kdeedu-4.7.1/kalgebra-4.7.1/src/CMakeLists.txt.kalgebra_cmake	2011-05-20 22:33:50.000000000 +0200
++++ kdeedu-4.7.1/kalgebra-4.7.1/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.7.1-kmplot_cmake.patch b/kdeedu-4.7.1-kmplot_cmake.patch
new file mode 100644
index 0000000..334bd3f
--- /dev/null
+++ b/kdeedu-4.7.1-kmplot_cmake.patch
@@ -0,0 +1,12 @@
+diff -up kdeedu-4.7.1/kmplot-4.7.1/CMakeLists.txt.kmplot_cmake kdeedu-4.7.1/kmplot-4.7.1/CMakeLists.txt
+--- kdeedu-4.7.1/kmplot-4.7.1/CMakeLists.txt.kmplot_cmake	2011-09-01 22:47:27.000000000 +0200
++++ kdeedu-4.7.1/kmplot-4.7.1/CMakeLists.txt	2011-09-07 15:09:24.000000000 +0200
+@@ -4,7 +4,7 @@ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ include(CheckIncludeFiles)
+ 
+-include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
++include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES})
+ 
+ check_include_files(ieeefp.h HAVE_IEEEFP_H)
+ configure_file(config-kmplot.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kmplot/config-kmplot.h)
diff --git a/kdeedu.spec b/kdeedu.spec
index 3c88afd..c9daf7d 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.7.0-kalgebra_cmake.patch
+Patch1: kdeedu-4.7.1-kalgebra_cmake.patch
 
 # fix out of source build
-Patch2: kdeedu-4.7.0-kmplot_cmake.patch
+Patch2: kdeedu-4.7.1-kmplot_cmake.patch
 
 ## upstreamable patches