[kdenetwork] kdenetwork(kopete) FTBFS against qt-4.8.0-beta1 (#724846)

[Rex Dieter]

commit 168cc03ee5331163d0090eb8b8ae2cff970f8aaa
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 5 14:57:53 2011 -0500

    kdenetwork(kopete) FTBFS against qt-4.8.0-beta1 (#724846)

 kdenetwork-4.7.0-kopete-moc-fail.patch |   28 ++++++++++++++++++++++++++++
 kdenetwork.spec                        |   12 ++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/kdenetwork-4.7.0-kopete-moc-fail.patch b/kdenetwork-4.7.0-kopete-moc-fail.patch
new file mode 100644
index 0000000..8213b53
--- /dev/null
+++ b/kdenetwork-4.7.0-kopete-moc-fail.patch
@@ -0,0 +1,28 @@
+diff -up ./kdenetwork-4.7.0/kopete/libkopete/kopetepassword.cpp.moc-fail ./kdenetwork-4.7.0/kopete/libkopete/kopetepassword.cpp
+--- ./kdenetwork-4.7.0/kopete/libkopete/kopetepassword.cpp.moc-fail	2011-06-24 13:04:18.000000000 +0200
++++ ./kdenetwork-4.7.0/kopete/libkopete/kopetepassword.cpp	2011-08-02 17:48:02.750431366 +0200
+@@ -77,7 +77,7 @@ class KopetePasswordRequest : public Kop
+ {
+ public:
+ 	KopetePasswordRequest( QObject *owner, Kopete::Password &pass )
+-	 : QObject( owner ), mPassword( pass ), mWallet( 0 )
++	 : KopetePasswordRequestBase( owner ), mPassword( pass ), mWallet( 0 )
+ 	{
+ 	}
+ 
+diff -up ./kdenetwork-4.7.0/kopete/libkopete/kopetepassword.h.moc-fail ./kdenetwork-4.7.0/kopete/libkopete/kopetepassword.h
+--- ./kdenetwork-4.7.0/kopete/libkopete/kopetepassword.h.moc-fail	2011-06-24 13:04:18.000000000 +0200
++++ ./kdenetwork-4.7.0/kopete/libkopete/kopetepassword.h	2011-08-02 17:51:41.466283395 +0200
+@@ -183,9 +183,11 @@ private:
+  * @internal
+  * @see KopetePassword
+  */
+-class KopetePasswordRequestBase : public virtual QObject
++class KopetePasswordRequestBase : public QObject
+ {
+ 	Q_OBJECT
++public:
++    KopetePasswordRequestBase(QObject *owner) : QObject(owner) {}
+ signals:
+ 	void requestFinished( const QString &password );
+ public slots:
diff --git a/kdenetwork.spec b/kdenetwork.spec
index d67294b..2205954 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -3,7 +3,7 @@ Summary: KDE Network Applications
 Name:    kdenetwork
 Epoch:   7
 Version: 4.7.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -22,11 +22,15 @@ Patch2: kdenetwork-4.3.3-resolv-conf-path.patch
 
 # HACK to omit FTBFS kopete for now
 # test against _qt48 macro when available -- rex
-%if 0%{?fedora} < 16
+#if 0%{?fedora} < 16
+%if 1
 %define kopete 1
 %endif
 
 ## upstream patches
+# https://bugzilla.redhat.com/show_bug.cgi?id=724846
+# http://bugs.kde.org/show_bug.cgi?id=274827
+Patch100: kdenetwork-4.7.0-kopete-moc-fail.patch
 
 ## security patches
 
@@ -227,6 +231,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
 %setup -q -a 1 -n kdenetwork-%{version}%{?alphatag}
 %patch1 -p1 -b .icon
 %patch2 -p1 -b .resolv-conf-path
+%patch100 -p1 -b .kopete-moc-fail
 
 
 %build
@@ -491,6 +496,9 @@ fi
 
 
 %changelog
+* Fri Aug 05 2011 Rex Dieter <rdieter at fedoraproject.org> 7:4.7.0-3
+- kdenetwork(kopete) FTBFS against qt-4.8.0-beta1 (#724846)
+
 * Fri Aug 05 2011 Rex Dieter <rdieter at fedoraproject.org> 7:4.7.0-2
 - -common: Obsoletes: kdenetwork-libs