[kdeedu/f15] fix rpm file list

[Than Ngo]

commit 0f00c0f82ed1a7c77c39a60ec8c28415b4bb9777
Author: Than Ngo <than at redhat.com>
Date:   Thu Jun 9 13:37:05 2011 +0200

    fix rpm file list

 kdeedu-4.6.4-marble-doc.patch |   20 ++++++++++++++++++++
 kdeedu.spec                   |   10 +++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)
---
diff --git a/kdeedu-4.6.4-marble-doc.patch b/kdeedu-4.6.4-marble-doc.patch
new file mode 100644
index 0000000..b85d483
--- /dev/null
+++ b/kdeedu-4.6.4-marble-doc.patch
@@ -0,0 +1,20 @@
+diff -up kdeedu-4.6.4/marble/CMakeLists.txt.doc kdeedu-4.6.4/marble/CMakeLists.txt
+--- kdeedu-4.6.4/marble/CMakeLists.txt.doc	2011-04-14 23:45:18.000000000 +0200
++++ kdeedu-4.6.4/marble/CMakeLists.txt	2011-06-09 12:35:14.000000000 +0200
+@@ -293,6 +293,7 @@ include_directories(
+ )
+ ####################################################
+ # Descend into subdirectories
++add_subdirectory(doc)
+ add_subdirectory(src)
+ add_subdirectory(data)
+ 
+diff -up kdeedu-4.6.4/marble/doc/CMakeLists.txt.doc kdeedu-4.6.4/marble/doc/CMakeLists.txt
+--- kdeedu-4.6.4/marble/doc/CMakeLists.txt.doc	2011-06-09 12:51:10.000000000 +0200
++++ kdeedu-4.6.4/marble/doc/CMakeLists.txt	2011-06-09 12:52:04.000000000 +0200
+@@ -1,4 +1,4 @@
+ ########### install files ###############
+ #
+ 
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR marble)
diff --git a/kdeedu.spec b/kdeedu.spec
index cfde55a..bc7a84b 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -1,3 +1,5 @@
+# interim Marble release (Marble 1.1.0)
+%global marblever 1.1.0
 
 # The Kalzium solver needs OCaml with native compilation support (ocamlopt) and
 # ocaml-facile.
@@ -14,9 +16,8 @@ License: GPLv2
 Group:   Amusements/Games
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
-# interim Marble release (Marble 1.1.0)
-%global marblever 1.1.0
 Source1: http://files.kde.org/marble/downloads/sources/marble-%{marblever}-source.tar.gz
+Patch0: kdeedu-4.6.4-marble-doc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
@@ -192,7 +193,7 @@ Group:   System Environment/Libraries
 %setup -q -T -D -n kdeedu-%{version}%{?alphatag}
 rm -rf marble
 mv marble-%{marblever} marble
-
+%patch0 -p1 -b .doc
 
 %build
 mkdir -p %{_target_platform}
@@ -462,9 +463,8 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_appsdir}/cmake/modules/FindKDEEdu.cmake
 %{_kde4_appsdir}/cmake/modules/FindMarble.cmake
-%{_kde4_appsdir}/cmake/modules/FindMarbleWidget.cmake
+%{_libdir}/cmake/libkdeedu/
 %{_kde4_includedir}/libkdeedu/
 %{_kde4_includedir}/libkiten/
 %{_kde4_includedir}/rocs/