[kdesdk] fix umbrello doc build/install

Rex Dieter rdieter at fedoraproject.org
Sun Jun 10 14:44:55 UTC 2012


commit 301d8dd15cdd717a34897e979206b1c5f64fb27f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Jun 10 09:47:34 2012 -0500

    fix umbrello doc build/install

 kdesdk-4.8.90-umbrello_doc.patch |   16 ++++++++++++++++
 kdesdk.spec                      |    6 +++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/kdesdk-4.8.90-umbrello_doc.patch b/kdesdk-4.8.90-umbrello_doc.patch
new file mode 100644
index 0000000..031632d
--- /dev/null
+++ b/kdesdk-4.8.90-umbrello_doc.patch
@@ -0,0 +1,16 @@
+diff -up kdesdk-4.8.90/doc/CMakeLists.txt.umbrello_doc kdesdk-4.8.90/doc/CMakeLists.txt
+--- kdesdk-4.8.90/doc/CMakeLists.txt.umbrello_doc	2012-06-10 09:46:33.435635712 -0500
++++ kdesdk-4.8.90/doc/CMakeLists.txt	2012-06-10 09:46:54.679370125 -0500
+@@ -27,9 +27,6 @@ endif()
+ if(BUILD_scripts)
+   add_subdirectory(scripts)
+ endif()
+-
+-if(LIBXSLT_FOUND AND LIBXML2_FOUND)
+-  if(BUILD_umbrello)
+-     add_subdirectory(umbrello)
+-  endif()
+-endif(LIBXSLT_FOUND AND LIBXML2_FOUND)
++if(BUILD_umbrello)
++  add_subdirectory(umbrello)
++endif()
diff --git a/kdesdk.spec b/kdesdk.spec
index 2483fd5..9a2d94a 100644
--- a/kdesdk.spec
+++ b/kdesdk.spec
@@ -15,6 +15,7 @@ Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.t
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
+Patch50: kdesdk-4.8.90-umbrello_doc.patch
 
 ## upstream patches
 
@@ -26,7 +27,8 @@ BuildRequires: apr-devel
 BuildRequires: binutils-devel binutils-static
 BuildRequires: boost-devel
 BuildRequires: flex
-BuildRequires: kdebase-devel >= %{version}
+BuildRequires: gettext-devel
+BuildRequires: kde-baseapps-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 # kstartperf
 BuildRequires: libtool-ltdl-devel
@@ -253,6 +255,8 @@ Requires: %{name}-common = %{version}-%{release}
 %prep
 %setup -q -n kdesdk-%{version}
 
+%patch50 -p1 -b .umbrello_doc
+
 
 %build
 mkdir -p %{_target_platform}


More information about the scm-commits mailing list