[kdesdk] fix umbrello FTBS (#725077)

[Jaroslav Reznik]

commit ad2ff32297668afc76eafa2b7ac29711d6680c58
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Wed Aug 3 11:00:09 2011 +0200

    fix umbrello FTBS (#725077)

 kdesdk-4.7.0-fix-qt48-moc.patch |   12 ++++++++++++
 kdesdk.spec                     |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/kdesdk-4.7.0-fix-qt48-moc.patch b/kdesdk-4.7.0-fix-qt48-moc.patch
new file mode 100644
index 0000000..92a7b5c
--- /dev/null
+++ b/kdesdk-4.7.0-fix-qt48-moc.patch
@@ -0,0 +1,12 @@
+diff -up ./kdesdk-4.7.0/umbrello/umbrello/codegenerators/ownedcodeblock.h.moc-fail ./kdesdk-4.7.0/umbrello/umbrello/codegenerators/ownedcodeblock.h
+--- ./kdesdk-4.7.0/umbrello/umbrello/codegenerators/ownedcodeblock.h.moc-fail	2009-01-28 00:03:55.000000000 +0100
++++ ./kdesdk-4.7.0/umbrello/umbrello/codegenerators/ownedcodeblock.h	2011-08-02 18:00:16.015592150 +0200
+@@ -23,7 +23,7 @@ class UMLObject;
+  * Describes any codeblock which is 'owned' by a UMLobject of some sort and should
+  * be in sync with that parent.
+  */
+-class OwnedCodeBlock : virtual public QObject
++class OwnedCodeBlock : public QObject
+ {
+     Q_OBJECT
+ public:
diff --git a/kdesdk.spec b/kdesdk.spec
index 1aec0cc..d6e62ec 100644
--- a/kdesdk.spec
+++ b/kdesdk.spec
@@ -1,11 +1,12 @@
 Name:           kdesdk
 Summary:        The KDE Software Development Kit (SDK)
 Version:        4.7.0
-Release:        1%{?dist}
+Release:        2%{?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
@@ -254,6 +255,9 @@ 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
 
 %build
 mkdir -p %{_target_platform}
@@ -693,6 +697,9 @@ fi
 
 
 %changelog
+* Wed Aug 03 2011 Jaroslav Reznik <jreznik at redhat.com> 4.7.0-2
+- fix umbrello FTBS (#725077)
+
 * Tue Jul 26 2011 Jaroslav Reznik <jreznik at redhat.com> 4.7.0-1
 - 4.7.0
 - omit FTBFS umbrello for now (#725077)