From 29edff4b633052d6e7ff91f7a37fdd518ca8d35f Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Fri, 14 Jan 2011 18:49:03 +0000
Subject: [PATCH] Minor refresh of the patches.

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=44
---
 virt-manager-fix-python27.diff | 12 ++++--------
 virtman-desktop.diff           | 12 ++----------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/virt-manager-fix-python27.diff b/virt-manager-fix-python27.diff
index 47937467..76b04dd8 100644
--- a/virt-manager-fix-python27.diff
+++ b/virt-manager-fix-python27.diff
@@ -1,10 +1,8 @@
-Index: b/src/virt-manager.py.in
+Index: virt-manager-0.8.5/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
+--- virt-manager-0.8.5.orig/src/virt-manager.py.in
++++ virt-manager-0.8.5/src/virt-manager.py.in
+@@ -278,7 +278,7 @@ def main():
      # on as if all were fine. Ultimately bad stuff happens,
      # so lets catch it here & get the hell out...
      import warnings
@@ -13,5 +11,3 @@ Index: b/src/virt-manager.py.in
      try:
          import gobject
  
-         # Set program name for gnome shell (before importing gtk, which
-         # seems to call set_prgname on its own)
diff --git a/virtman-desktop.diff b/virtman-desktop.diff
index 96064dfe..6ddfb303 100644
--- a/virtman-desktop.diff
+++ b/virtman-desktop.diff
@@ -2,9 +2,7 @@ Index: virt-manager-0.8.5/src/Makefile.am
 ===================================================================
 --- virt-manager-0.8.5.orig/src/Makefile.am
 +++ virt-manager-0.8.5/src/Makefile.am
-@@ -12,11 +12,11 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
- libexec_SCRIPTS = $(PACKAGE)-launch
- 
+@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
  gladedir = $(pkgdatadir)
  glade_DATA = $(wildcard $(srcdir)/*.glade)
  
@@ -13,15 +11,11 @@ Index: virt-manager-0.8.5/src/Makefile.am
  desktop_DATA_IN = $(PACKAGE).desktop.in.in
  desktop_DATA = $(PACKAGE).desktop
  
- dbusdir = $(datadir)/dbus-1/services
- dbus_DATA_IN = $(PACKAGE).service.in
 Index: virt-manager-0.8.5/src/Makefile.in
 ===================================================================
 --- virt-manager-0.8.5.orig/src/Makefile.in
 +++ virt-manager-0.8.5/src/Makefile.in
-@@ -237,11 +237,11 @@ python_DATA_IN = $(PACKAGE).py.in
- python_DATA = $(PACKAGE).py
- libexec_DATA_IN = $(PACKAGE)-launch.in
+@@ -239,7 +239,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
  libexec_SCRIPTS = $(PACKAGE)-launch
  gladedir = $(pkgdatadir)
  glade_DATA = $(wildcard $(srcdir)/*.glade)
@@ -30,8 +24,6 @@ Index: virt-manager-0.8.5/src/Makefile.in
  desktop_DATA_IN = $(PACKAGE).desktop.in.in
  desktop_DATA = $(PACKAGE).desktop
  dbusdir = $(datadir)/dbus-1/services
- dbus_DATA_IN = $(PACKAGE).service.in
- dbus_DATA = $(PACKAGE).service
 Index: virt-manager-0.8.5/src/virt-manager.desktop.in.in
 ===================================================================
 --- virt-manager-0.8.5.orig/src/virt-manager.desktop.in.in