Merge pull request #4 from nemomobile-packages/pygobject

[tests] switch to using gireactor to work with new gi based pygobject2

rpm/0001-switch-to-using-gireactor-to-work-with-new-gi-based-.patch

@@ -0,0 +1,45 @@
+From aaf8532e1512a5e9340a33c3f82c16e9dd8b34c6 Mon Sep 17 00:00:00 2001
+From: Islam Amer <islam.amer@jollamobile.com>
+Date: Wed, 30 Apr 2014 00:30:43 +0300
+Subject: [PATCH] switch to using gireactor to work with new gi based
+ pygobject2
+
+---
+ tests/twisted/servicetest.py | 4 ++--
+ tests/twisted/test-helper.py | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py
+index 31c00f4..adb3030 100644
+--- a/tests/twisted/servicetest.py
++++ b/tests/twisted/servicetest.py
+@@ -3,9 +3,9 @@
+ Infrastructure code for testing connection managers.
+ """
+
+-from twisted.internet import glib2reactor
++from twisted.internet import gireactor
+ from twisted.internet.protocol import Protocol, Factory, ClientFactory
+-glib2reactor.install()
++gireactor.install()
+ import sys
+ import time
+ import os
+diff --git a/tests/twisted/test-helper.py b/tests/twisted/test-helper.py
+index 4909a96..5fb5e8e 100644
+--- a/tests/twisted/test-helper.py
++++ b/tests/twisted/test-helper.py
+@@ -18,8 +18,8 @@ Once your'e done, the test code is written to a file called test.dump.
+ import pdb
+ import pprint
+
+-from twisted.internet import glib2reactor
+-glib2reactor.install()
++from twisted.internet import gireactor
++gireactor.install()
+
+ from gabbletest import EventTest, run
+
+-- 
+1.9.0
+

rpm/telepathy-gabble.spec

@@ -1,13 +1,5 @@
-#
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.26
-#
-
 Name:       telepathy-gabble
 
-# >> macros
-# << macros
-
 Summary:    A Jabber/XMPP connection manager
 Version:    0.18.1
 Release:    1
@@ -21,6 +13,7 @@ Patch0:     nemo-tests-dir-fix.patch
 Patch1:     0001-Disable-parallel-build-for-extensions-directory.patch
 Patch2:	    wocky-disable-gtkdoc.patch
 Patch3:     0001-Change-default-keepalive-interval-to-2.5-minutes.patch
+Patch4:     0001-switch-to-using-gireactor-to-work-with-new-gi-based-.patch
 Requires:   telepathy-mission-control
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -76,6 +69,8 @@ cd lib/ext/wocky
 cd ../../..
 # 0001-Change-default-keepalive-interval-to-2.5-minutes.patch
 %patch3 -p1
+# 0001-switch-to-using-gireactor-to-work-with-new-gi-based-.patch
+%patch4 -p1
 
 # >> setup
 %__cp $RPM_SOURCE_DIR/mktests.sh tests/