[kdesdk] *really* (and unconditionally) include umbrello fix build on big endian/s390

[Rex Dieter]

commit 824117253af15a224b02e8b02864b4fd942018bd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 8 16:03:53 2011 -0500

    *really* (and unconditionally) include umbrello
    fix build on big endian/s390

 kdesdk-4.7.0-NO_STRUCTURES_TOOL.patch |   14 ++++++++++++
 kdesdk.spec                           |   37 +++++++++++---------------------
 2 files changed, 27 insertions(+), 24 deletions(-)
---
diff --git a/kdesdk-4.7.0-NO_STRUCTURES_TOOL.patch b/kdesdk-4.7.0-NO_STRUCTURES_TOOL.patch
new file mode 100644
index 0000000..00a35a3
--- /dev/null
+++ b/kdesdk-4.7.0-NO_STRUCTURES_TOOL.patch
@@ -0,0 +1,14 @@
+diff -up kdesdk-4.7.0/okteta/program/mainwindow.cpp.NO_STRUCTURES_TOOL kdesdk-4.7.0/okteta/program/mainwindow.cpp
+--- kdesdk-4.7.0/okteta/program/mainwindow.cpp.NO_STRUCTURES_TOOL	2011-06-22 10:09:38.000000000 -0500
++++ kdesdk-4.7.0/okteta/program/mainwindow.cpp	2011-08-08 15:48:48.329320476 -0500
+@@ -43,8 +43,10 @@
+ #include <bytetable/bytetabletool.h>
+ #include <bookmarks/bookmarkstoolview.h>
+ #include <bookmarks/bookmarkstool.h>
++#ifndef NO_STRUCTURES_TOOL
+ #include <structures/structtoolview.h>
+ #include <structures/structtool.h>
++#endif
+ // Kasten tools
+ #include <document/versionview/versionviewtoolview.h>
+ #include <document/versionview/versionviewtool.h>
diff --git a/kdesdk.spec b/kdesdk.spec
index d6e62ec..70b9b0a 100644
--- a/kdesdk.spec
+++ b/kdesdk.spec
@@ -1,21 +1,20 @@
 Name:           kdesdk
 Summary:        The KDE Software Development Kit (SDK)
 Version:        4.7.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0:         kdesdk-4.7.0-fix-qt48-moc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# HACK to omit FTBFS umbrello for now
-# test against _qt48 macro when available -- rex
-%if 0%{?fedora} < 16
-%define umbrello 1
-%endif
+## upstreamable patches
+# fix big endian check/logic to not fail the build
+Patch50: kdesdk-4.7.0-NO_STRUCTURES_TOOL.patch 
 
 ## upstream patches
+# fix qt 4.8 moc issue due to use of virtual inheritance (#725077)
+Patch100: kdesdk-4.7.0-fix-qt48-moc.patch
 
 # FIXME: Missing dependency on jpackage-utils and java?
 BuildRequires:  antlr-static antlr-tool jpackage-utils java >= 1.6
@@ -51,9 +50,7 @@ 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
 
@@ -66,17 +63,12 @@ A collection of applications and tools used by developers, including:
 * kuiviewer: displays designer's UI files
 * lokalize: computer-aided translation system focusing on productivity and performance
 * okteta: binary/hex editor
-%if 0%{?umbrello}
 * umbrello: UML modeller and UML diagram tool
-%endif
 
 %package common
 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}.
@@ -255,19 +247,17 @@ Requires: %{name}-common = %{version}-%{release}
 %prep
 %setup -q -n kdesdk-%{version}
 
-# fix qt 4.8 moc issue due to use of virtual inheritance (#725077)
-# upstreamed, applied
-%patch0 -p2 -b .fix-qt48-moc
+%patch50 -p1 -b .NO_STRUCTURES_TOOL
+%patch100 -p2 -b .fix-qt48-moc
+
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
-  %{!?umbrello: -DBUILD_umbrello:BOOL=OFF} \
   ..
 popd
 
-make -C %{_target_platform}/doc
 make %{?_smp_mflags} -C %{_target_platform}
 
 
@@ -282,10 +272,7 @@ 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
 # This one fits better into krazy2 (it requires krazy2), and the version in
@@ -579,7 +566,6 @@ fi
 %{_kde4_includedir}/kasten/
 %{_kde4_libdir}/libkasten*.so
 
-%if 0%{?umbrello}
 %post umbrello
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
@@ -601,7 +587,6 @@ 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
@@ -697,6 +682,10 @@ fi
 
 
 %changelog
+* Mon Aug 08 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.0-3
+- *really* (and unconditionally) include umbrello
+- fix build on big endian/s390
+
 * Wed Aug 03 2011 Jaroslav Reznik <jreznik at redhat.com> 4.7.0-2
 - fix umbrello FTBS (#725077)