[kdeaccessibility/f16] Fix jovie build with Qt-4.8

[Radek Novacek]

commit 2cca34652e57e0d432d39a44b1a3638397d7ad80
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Wed Aug 3 11:48:20 2011 +0200

    Fix jovie build with Qt-4.8

 kdeaccessibility-4.7.0-moc-fail.patch |   12 ++++++++++++
 kdeaccessibility.spec                 |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/kdeaccessibility-4.7.0-moc-fail.patch b/kdeaccessibility-4.7.0-moc-fail.patch
new file mode 100644
index 0000000..0f2fd16
--- /dev/null
+++ b/kdeaccessibility-4.7.0-moc-fail.patch
@@ -0,0 +1,12 @@
+diff -up ./kdeaccessibility-4.7.0/jovie/filters/xmltransformer/xmltransformerproc.h.moc-fail ./kdeaccessibility-4.7.0/jovie/filters/xmltransformer/xmltransformerproc.h
+--- ./kdeaccessibility-4.7.0/jovie/filters/xmltransformer/xmltransformerproc.h.moc-fail	2011-07-07 18:17:43.000000000 +0200
++++ ./kdeaccessibility-4.7.0/jovie/filters/xmltransformer/xmltransformerproc.h	2011-08-02 18:09:23.645718696 +0200
+@@ -33,7 +33,7 @@
+ 
+ class K3Process;
+ 
+-class XmlTransformerProc : virtual public KttsFilterProc
++class XmlTransformerProc : public KttsFilterProc
+ {
+     Q_OBJECT
+ 
diff --git a/kdeaccessibility.spec b/kdeaccessibility.spec
index 8a7202c..3a9e880 100644
--- a/kdeaccessibility.spec
+++ b/kdeaccessibility.spec
@@ -2,11 +2,12 @@ Summary:        KDE Accessibility
 Name:           kdeaccessibility
 Epoch:          1
 Version:        4.7.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://accessibility.kde.org/
+Patch0:         kdeaccessibility-4.7.0-moc-fail.patch
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeaccessibility-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,6 +58,9 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %prep
 %setup -q -n kdeaccessibility-%{version}%{?alphatag}
 
+# fix qt 4.8 moc issue due to use of virtual inheritance 
+# (same as in #725077), applied upstream
+%patch0 -p2 -b .moc-fail
 
 %build
 mkdir -p %{_target_platform}
@@ -143,6 +147,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
+* Wed Aug 03 2011 Radek Novacek <rnovacek at redhat.com> - 4.7.0-2
+- Fix jovie build with Qt-4.8
+
 * Tue Jul 26 2011 Jaroslav Reznik <jreznik at redhat.com> - 4.7.0-1
 - 4.7.0