[kdesdk] - omit FTBFS umbrello for now (#725077)

[Rex Dieter]

commit 0a7888fd01cd2ab11641e83cfe1bf3a44055e9a9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Jul 31 11:34:34 2011 -0500

    - omit FTBFS umbrello for now (#725077)

 kdesdk-4.7.0-no_umbrello.patch |   16 ++++++++++++++++
 kdesdk.spec                    |   21 +++++++++++++++++++++
 2 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/kdesdk-4.7.0-no_umbrello.patch b/kdesdk-4.7.0-no_umbrello.patch
new file mode 100644
index 0000000..d03da9d
--- /dev/null
+++ b/kdesdk-4.7.0-no_umbrello.patch
@@ -0,0 +1,16 @@
+diff -up kdesdk-4.7.0/CMakeLists.txt.no_umbrello kdesdk-4.7.0/CMakeLists.txt
+--- kdesdk-4.7.0/CMakeLists.txt.no_umbrello	2011-06-22 10:09:38.000000000 -0500
++++ kdesdk-4.7.0/CMakeLists.txt	2011-07-31 11:27:49.972640330 -0500
+@@ -101,9 +101,9 @@ message(STATUS "remember to port scheck 
+ #add_subdirectory(scheck)
+ macro_optional_add_subdirectory(scripts)
+ 
+-if(LIBXSLT_FOUND AND LIBXML2_FOUND AND Boost_FOUND)
+-  macro_optional_add_subdirectory(umbrello)
+-endif(LIBXSLT_FOUND AND LIBXML2_FOUND AND Boost_FOUND)
++#if(LIBXSLT_FOUND AND LIBXML2_FOUND AND Boost_FOUND)
++#  macro_optional_add_subdirectory(umbrello)
++#endif(LIBXSLT_FOUND AND LIBXML2_FOUND AND Boost_FOUND)
+ 
+ macro_optional_add_subdirectory(doc)
+ macro_display_feature_log()
diff --git a/kdesdk.spec b/kdesdk.spec
index aee228e..7227a95 100644
--- a/kdesdk.spec
+++ b/kdesdk.spec
@@ -8,6 +8,13 @@ URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# HACK to omit FTBFS umbrello for now
+Patch1: kdesdk-4.7.0-no_umbrello.patch 
+# test against _qt48 macro when available -- rex
+%if 0%{?fedora} < 16
+%define umbrello 1
+%endif
+
 ## upstream patches
 
 # FIXME: Missing dependency on jpackage-utils and java?
@@ -44,7 +51,9 @@ Requires: %{name}-okteta = %{version}-%{release}
 Requires: %{name}-poxml = %{version}-%{release}
 Requires: %{name}-scripts = %{version}-%{release}
 Requires: %{name}-strigi-analyzer = %{version}-%{release}
+%if 0%{?umbrello}
 Requires: %{name}-umbrello = %{version}-%{release}
+%endif
 # for upgrade path, when kate was split out 
 Requires: kate
 
@@ -63,6 +72,9 @@ A collection of applications and tools used by developers, including:
 Summary: Common files for %{name}
 # when split occurred
 Conflicts: kdesdk < 4.6.95-10
+%if ! 0%{?umbrello}
+Obsoletes:  %{name}-umbrello < %{version}-%{release}
+%endif
 BuildArch: noarch
 %description common
 %{summary}.
@@ -241,6 +253,10 @@ Requires: %{name}-common = %{version}-%{release}
 %prep
 %setup -q -n kdesdk-%{version}
 
+%if ! 0%{?umbrello} 
+%patch1 -p1 -b .no_umbrello
+%endif
+
 
 %build
 mkdir -p %{_target_platform}
@@ -263,7 +279,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %find_lang kompare --with-kde --without-mo
 %find_lang lokalize --with-kde --without-mo
 %find_lang okteta --with-kde --without-mo
+%if 0%{?umbrello}
 %find_lang umbrello --with-kde --without-mo
+%endif
 
 
 # unpackaged files
@@ -558,6 +576,7 @@ fi
 %{_kde4_includedir}/kasten/
 %{_kde4_libdir}/libkasten*.so
 
+%if 0%{?umbrello}
 %post umbrello
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
@@ -579,6 +598,7 @@ fi
 %{_kde4_iconsdir}/hicolor/*/apps/umbrello.*
 %{_kde4_iconsdir}/hicolor/*/mimetypes/application-x-uml.*
 %{_kde4_datadir}/applications/kde4/umbrello.desktop
+%endif
 
 %files poxml 
 %{_kde4_bindir}/po2xml
@@ -676,6 +696,7 @@ fi
 %changelog
 * Tue Jul 26 2011 Jaroslav Reznik <jreznik at redhat.com> 4.7.0-1
 - 4.7.0
+- omit FTBFS umbrello for now (#725077)
 
 * Mon Jul 25 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.95-12
 - Requires: kate (for upgrade path)