From 64735ee00cb6a3e7b17a2d9c24e9d455af69e459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 22 Oct 2010 14:15:08 +0000
Subject: [PATCH] Accepting request 51250 from
 home:seife:branches:Virtualization

OBS-URL: https://build.opensuse.org/request/show/51250
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=40
---
 virt-manager.changes |  6 ++++++
 virt-manager.spec    |  6 +++++-
 virtman-desktop.diff | 14 +++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/virt-manager.changes b/virt-manager.changes
index 1f16c0df..0caf3105 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 22 12:16:35 UTC 2010 - seife@opensuse.org
+
+- fix up previous commit that broke the patch
+- fix runtime dependency on python-vte
+
 -------------------------------------------------------------------
 Thu Oct 21 13:38:14 MDT 2010 - carnold@novell.com
 
diff --git a/virt-manager.spec b/virt-manager.spec
index feb3d2ff..3255a01e 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -101,7 +101,11 @@ Requires:       libxml2-python >= 2.6.23
 # Required for our graphics which are currently SVG format
 # Earlier vte had broken python binding module
 # Requires:       vte >= 0.12.2
-Requires:       vte
+%ifarch x86_64
+Requires:  vtemodule.so()(64bit)
+%else
+Requires:  vtemodule.so
+%endif
 # For online help
 Requires:       scrollkeeper
 # For console widget
diff --git a/virtman-desktop.diff b/virtman-desktop.diff
index 90dcdf43..96064dfe 100644
--- a/virtman-desktop.diff
+++ b/virtman-desktop.diff
@@ -2,7 +2,9 @@ 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
-@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
+@@ -12,11 +12,11 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
+ libexec_SCRIPTS = $(PACKAGE)-launch
+ 
  gladedir = $(pkgdatadir)
  glade_DATA = $(wildcard $(srcdir)/*.glade)
  
@@ -11,11 +13,15 @@ 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
-@@ -239,7 +239,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
+@@ -237,11 +237,11 @@ python_DATA_IN = $(PACKAGE).py.in
+ python_DATA = $(PACKAGE).py
+ libexec_DATA_IN = $(PACKAGE)-launch.in
  libexec_SCRIPTS = $(PACKAGE)-launch
  gladedir = $(pkgdatadir)
  glade_DATA = $(wildcard $(srcdir)/*.glade)
@@ -24,11 +30,13 @@ 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
 +++ virt-manager-0.8.5/src/virt-manager.desktop.in.in
-@@ -1,9 +1,20 @@
+@@ -1,9 +1,19 @@
  [Desktop Entry]
  _Name=Virtual Machine Manager
  _Comment=Manage virtual machines