[gajim] Workaround pygtk crash with Python 2.7 (RHBZ#621887).

[Michal Schmidt]

commit 9c1880db8fccf8fc70d8b624e181904916bd29a5
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Aug 10 13:48:08 2010 +0200

    Workaround pygtk crash with Python 2.7 (RHBZ#621887).

 ...m-0.13.4-pygtk-crash-python2.7-workaround.patch |   18 ++++++++++++++++++
 gajim.spec                                         |    7 ++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/gajim-0.13.4-pygtk-crash-python2.7-workaround.patch b/gajim-0.13.4-pygtk-crash-python2.7-workaround.patch
new file mode 100644
index 0000000..fe4f80d
--- /dev/null
+++ b/gajim-0.13.4-pygtk-crash-python2.7-workaround.patch
@@ -0,0 +1,18 @@
+Avoid an assertion failure and crash of the python interpreter caused by
+pygtk's usage of the deprecated PyCObject and Python 2.7.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=621887
+
+Index: gajim-0.13.4/src/gajim.py
+===================================================================
+--- gajim-0.13.4.orig/src/gajim.py
++++ gajim-0.13.4/src/gajim.py
+@@ -131,7 +131,7 @@ if os.name == 'nt':
+ 	sys.stderr = MyStderr()
+ 
+ # PyGTK2.10+ only throws a warning
+-warnings.filterwarnings('error', module='gtk')
++warnings.filterwarnings('error', module='gtk', append=True)
+ try:
+ 	import gtk
+ except Warning, msg:
diff --git a/gajim.spec b/gajim.spec
index a308d0b..59c3b8a 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -2,12 +2,13 @@ Summary:	Jabber client written in PyGTK
 Name:		gajim
 %global		majorver 0.13
 Version:	0.13.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
 Patch0:		gajim-0.13.3-gnome-keyring-CancelledError.patch
+Patch1:		gajim-0.13.4-pygtk-crash-python2.7-workaround.patch
 BuildArch:	noarch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -49,6 +50,7 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version} \
@@ -95,6 +97,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/src
 
 %changelog
+* Tue Aug 10 2010 Michal Schmidt <mschmidt at redhat.com> 0.13.4-2
+- Workaround pygtk crash with Python 2.7 (RHBZ#621887).
+
 * Sat Apr 03 2010 Michal Schmidt <mschmidt at redhat.com> 0.13.4-1
 - Update to upstream bugfix release 0.13.4.