From 31292f0042964fb9c5c3cc89b1215dc093a6f856 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Mon, 27 Sep 2010 14:57:44 +0000
Subject: [PATCH] Accepting request 49207 from
 home:seife:branches:Virtualization

OBS-URL: https://build.opensuse.org/request/show/49207
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=36
---
 virt-manager-fix-python27.diff | 17 +++++++++++++++++
 virt-manager.changes           |  6 ++++++
 virt-manager.spec              |  4 ++++
 3 files changed, 27 insertions(+)
 create mode 100644 virt-manager-fix-python27.diff

diff --git a/virt-manager-fix-python27.diff b/virt-manager-fix-python27.diff
new file mode 100644
index 00000000..47937467
--- /dev/null
+++ b/virt-manager-fix-python27.diff
@@ -0,0 +1,17 @@
+Index: b/src/virt-manager.py.in
+===================================================================
+--- a/src/virt-manager.py.in
++++ b/src/virt-manager.py.in
+@@ -271,11 +271,11 @@ def main():
+     # Urgh, pygtk merely logs a warning when failing to open
+     # the X11 display connection, and lets everything carry
+     # on as if all were fine. Ultimately bad stuff happens,
+     # so lets catch it here & get the hell out...
+     import warnings
+-    warnings.filterwarnings('error', module='gtk')
++    warnings.filterwarnings('error', module='gtk', append=True)
+     try:
+         import gobject
+ 
+         # Set program name for gnome shell (before importing gtk, which
+         # seems to call set_prgname on its own)
diff --git a/virt-manager.changes b/virt-manager.changes
index 8d968929..089ab9e8 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 27 11:10:48 UTC 2010 - seife@opensuse.org
+
+- fix instant segfault with python 2.7, bnc#641981, patch taken
+  from https://bugzilla.redhat.com/show_bug.cgi?id=620216
+
 -------------------------------------------------------------------
 Tue Sep 14 08:26:13 UTC 2010 - seife@opensuse.org
 
diff --git a/virt-manager.spec b/virt-manager.spec
index 1615d358..7b5f4c5a 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -37,6 +37,9 @@ Url:            http://virt-manager.et.redhat.com
 Source0:        virt-manager-%{version}.tar.bz2
 Source1:        %{virtinst_name}.tar.bz2
 Patch1:         1660-custom-icon-fix.patch
+# see https://bugzilla.redhat.com/show_bug.cgi?id=620216,
+#     https://bugzilla.novell.com/show_bug.cgi?id=641981
+Patch2:         virt-manager-fix-python27.diff
 Patch50:        virtman-desktop.diff
 Patch51:        virtman-vminstall.diff
 Patch52:        virtman-pointer.diff
@@ -128,6 +131,7 @@ Authors:
 %setup -q
 %setup -b 1
 %patch1 -p1
+%patch2 -p1
 %patch50 -p1
 %patch51 -p1
 #%patch52 -p1