From 8e0acf05b24386c35d57cb3591520f0701d1c482 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@fedoraproject.org>
Date: Mon, 1 Dec 2008 17:07:17 +0000
Subject: [PATCH] Fix spec for building on F9 Update 'New VM' virt descriptions
 to be less     black and white (bz 470563)

---
 virt-manager-0.6.0-fix-virt-type-desc.patch | 21 +++++++++++++++++++++
 virt-manager.spec                           | 12 +++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 virt-manager-0.6.0-fix-virt-type-desc.patch

diff --git a/virt-manager-0.6.0-fix-virt-type-desc.patch b/virt-manager-0.6.0-fix-virt-type-desc.patch
new file mode 100644
index 0000000..1a6ae82
--- /dev/null
+++ b/virt-manager-0.6.0-fix-virt-type-desc.patch
@@ -0,0 +1,21 @@
+diff -rup virt-manager-0.6.0/src/vmm-create.glade new/src/vmm-create.glade
+--- virt-manager-0.6.0/src/vmm-create.glade	2008-09-10 15:37:12.000000000 -0400
++++ new/src/vmm-create.glade	2008-11-25 12:08:47.161923000 -0500
+@@ -871,7 +871,7 @@
+ 			  <child>
+ 			    <widget class="GtkLabel" id="label296">
+ 			      <property name="visible">True</property>
+-			      <property name="label" translatable="yes">Lightweight method of virtualizing machines. Limits operating system choices because the OS must be specially modified to support paravirtualization. Better performance than fully virtualized systems.</property>
++			      <property name="label" translatable="yes">Lightweight method of virtualizing machines. Limits operating system choices because the OS must be specially modified to support paravirtualization, but yeilds better performance than fully virtualized systems.</property>
+ 			      <property name="use_underline">False</property>
+ 			      <property name="use_markup">True</property>
+ 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+@@ -949,7 +949,7 @@
+ 				  <child>
+ 				    <widget class="GtkLabel" id="label297">
+ 				      <property name="visible">True</property>
+-				      <property name="label" translatable="yes">Involves hardware simulation, allowing for a greater range of operating systems (does not require OS modification). Slower than paravirtualized systems.</property>
++				      <property name="label" translatable="yes">Involves hardware simulation, allowing for a greater range of virtual devices and operating systems (does not require OS modification).</property>
+ 				      <property name="use_underline">False</property>
+ 				      <property name="use_markup">True</property>
+ 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/virt-manager.spec b/virt-manager.spec
index a706297..a116c57 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.6.0
-Release: 4%{_extra_release}
+Release: 5%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -25,6 +25,7 @@ Patch5: %{name}-%{version}-update-translations.patch
 Patch6: %{name}-%{version}-multiple-sound-dev.patch
 Patch7: %{name}-%{version}-vol-copy-popup.patch
 Patch8: %{name}-%{version}-connect-variable-typo.patch
+Patch9: %{name}-%{version}-fix-virt-type-desc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # These two are just the oldest version tested
@@ -43,7 +44,11 @@ Requires: gnome-keyring >= 0.4.9
 # disabled
 Requires: gnome-python2-gnomekeyring >= 2.15.4
 Requires: gnome-python2-gnomevfs >= 2.15.4
+%if "%{fedora}" <= "9"
+Requires: gnome-python2
+%else
 Requires: gnome-python2-gnome
+%endif
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen & QEMU guests
@@ -98,6 +103,7 @@ management API.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %configure
@@ -187,6 +193,10 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Mon Dec  1 2008 Cole Robinson <crobinso@redhat.com> - 0.6.0-5.fc10
+- Fix spec for building on F9
+- Update 'New VM' virt descriptions to be less black and white (bz 470563)
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.6.0-4
 - Rebuild for Python 2.6