[kdesdk] include ftbfs fixes from trunk/

[Rex Dieter]

commit ceb26ba8d128225e015727994ff20d54a2351092
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Jun 10 20:14:33 2012 -0500

    include ftbfs fixes from trunk/

 kdesdk-trunk.patch |   23 +++++++++++++++++++++++
 kdesdk.spec        |    9 +++------
 2 files changed, 26 insertions(+), 6 deletions(-)
---
diff --git a/kdesdk-trunk.patch b/kdesdk-trunk.patch
new file mode 100644
index 0000000..bdbd121
--- /dev/null
+++ b/kdesdk-trunk.patch
@@ -0,0 +1,23 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 1298931)
++++ CMakeLists.txt	(working copy)
+@@ -29,6 +29,9 @@
+    ENDIF(EXISTS ${_fullPath}/CMakeLists.txt)
+ ENDMACRO (KDESDK_OPTIONAL_ADD_SUBDIRECTORY)
+ 
++cmake_minimum_required(VERSION 2.6)
++project(kdesdk)
++
+ # list of self-contained submodules
+ kdesdk_optional_add_subdirectory(kapptemplate)
+ kdesdk_optional_add_subdirectory(dolphin-plugins)
+@@ -43,8 +46,6 @@
+ 
+ ############################
+ # START OF OLD MODULE SETUP
+-cmake_minimum_required(VERSION 2.6)
+-project(kdesdk)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+ 
diff --git a/kdesdk.spec b/kdesdk.spec
index a53ef9a..0f834a9 100644
--- a/kdesdk.spec
+++ b/kdesdk.spec
@@ -20,11 +20,10 @@ Source1: CMakeLists.txt
 ## upstreamable patches
 # fix build for umbrello docs
 Patch50: kdesdk-4.8.90-umbrello_doc.patch
-# fix kstartperf build
-Patch51: kdesdk-4.8.90-kstartperf_pic.patch
 
 ## upstream patches
-
+# fix FTBFS
+Patch100: kdesdk-trunk.patch
 
 # FIXME: Missing dependency on jpackage-utils and java?
 BuildRequires: antlr-static antlr-tool
@@ -261,10 +260,8 @@ Requires: %{name}-common = %{version}-%{release}
 %prep
 %setup -q -n kdesdk-%{version}
 
-mv CMakeLists.txt CMakeLists.txt.orig
-install -m644 %{SOURCE1} .
-
 %patch50 -p1 -b .umbrello_doc
+%patch100 -p0 -b .trunk_ftbfs
 
 
 %build