Hello community,
here is the log from the commit of package virt-manager for openSUSE:Factory
checked in at Mon Apr 26 23:49:46 CEST 2010.
--------
--- virt-manager/virt-manager.changes 2010-04-02 18:06:30.000000000 +0200
+++ virt-manager/virt-manager.changes 2010-04-26 21:22:37.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Apr 26 10:58:32 MDT 2010 - carnold@novell.com
+
+- Fixes in virtman-keycombo.diff to match virt-viewer's 'Send Key'
+ menu options. See bnc#553633
+
+-------------------------------------------------------------------
+Mon Apr 19 10:57:30 MDT 2010 - carnold@novell.com
+
+- bnc#597235 - virt-manager does not start complaining about a
+ broken icon.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
virtman-icon.diff
New:
----
1660-custom-icon-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.G1Jeh8/_old 2010-04-26 23:49:11.000000000 +0200
+++ /var/tmp/diff_new_pack.G1Jeh8/_new 2010-04-26 23:49:11.000000000 +0200
@@ -28,12 +28,13 @@
Name: virt-manager
Summary: Virtual Machine Manager
Version: 0.8.4
-Release: 1
+Release: 2
Group: System/Monitoring
License: LGPLv2.1+
Url: http://virt-manager.et.redhat.com
Source0: virt-manager-%{version}.tar.bz2
Source1: %{virtinst_name}.tar.bz2
+Patch1: 1660-custom-icon-fix.patch
Patch50: virtman-desktop.diff
Patch51: virtman-vminstall.diff
Patch52: virtman-netcat.diff
@@ -46,7 +47,6 @@
Patch59: virtman-keycombo.diff
Patch60: virtman-autoconnect.diff
Patch61: virtman-device-flags.diff
-Patch62: virtman-icon.diff
Patch81: virtinst-cdrom.diff
Patch82: virtinst-storage-ocfs2.diff
ExclusiveArch: %{ix86} x86_64
@@ -68,14 +68,14 @@
# virtinst BuildRequires
BuildRequires: libxml2-python
BuildRequires: python-urlgrabber
-BuildRequires: libvirt-python
+#BuildRequires: libvirt-python
#
# Requires: pygtk2 >= 1.99.12-6
Requires: python-gtk
# Requires: gnome-python2-gconf >= 1.99.11-7
Requires: python-gnome
# Absolutely require this version or newer
-Requires: libvirt-python >= 0.3.0-1
+Requires: libvirt-python >= 0.5.0
Requires: vm-install
# Definitely does not work with earlier due to python API changes
# Requires: dbus-python >= 0.61
@@ -125,6 +125,7 @@
%prep
%setup -q
%setup -b 1
+%patch1 -p1
%patch50 -p1
%patch51 -p1
%patch52 -p1
@@ -137,7 +138,6 @@
%patch59 -p1
%patch60 -p1
%patch61 -p1
-%patch62 -p1
pushd $RPM_BUILD_DIR/%{virtinst_name}
%patch81 -p1
%patch82 -p1
@@ -182,6 +182,10 @@
%pre -f %{name}.schemas_pre
+%post
+%run_suseconfig -m glib2
+%run_suseconfig -m gtk2
+
%preun -f %{name}.schemas_preun
%posttrans -f %{name}.schemas_posttrans
@@ -196,7 +200,8 @@
%dir %{_datadir}/gconf/schemas
%config %{_datadir}/gconf/schemas/%{name}.schemas
%else
-%config %{gsysconfdir}/gconf/schemas/%{name}.schemas
+#%config %{gsysconfdir}/gconf/schemas/%{name}.schemas
+%config %{_datadir}/gconf/schemas/%{name}.schemas
%endif
%{_bindir}/%{name}
%{_bindir}/virt-clone
++++++ 1660-custom-icon-fix.patch ++++++
# HG changeset patch
# User Cole Robinson
# Date 1270757920 14400
# Node ID 5e11e6b33fec05dc5cd155ee9931464c2e10ef2b
# Parent 4c80ef09e3f03acdc7e6ec10e70812a263ef8d45
Fix custom icon installation.
Index: virt-manager-0.8.4/pixmaps/hicolor/16x16/actions/Makefile.am
===================================================================
--- virt-manager-0.8.4.orig/pixmaps/hicolor/16x16/actions/Makefile.am
+++ virt-manager-0.8.4/pixmaps/hicolor/16x16/actions/Makefile.am
@@ -1,5 +1,5 @@
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/16x16/action
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/16x16/actions
pixmap_DATA = $(wildcard *.png)
EXTRA_DIST = $(pixmap_DATA)
Index: virt-manager-0.8.4/pixmaps/hicolor/22x22/actions/Makefile.am
===================================================================
--- virt-manager-0.8.4.orig/pixmaps/hicolor/22x22/actions/Makefile.am
+++ virt-manager-0.8.4/pixmaps/hicolor/22x22/actions/Makefile.am
@@ -1,5 +1,5 @@
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/22x22/action
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/22x22/actions
pixmap_DATA = $(wildcard *.png)
EXTRA_DIST = $(pixmap_DATA)
Index: virt-manager-0.8.4/pixmaps/hicolor/24x24/actions/Makefile.am
===================================================================
--- virt-manager-0.8.4.orig/pixmaps/hicolor/24x24/actions/Makefile.am
+++ virt-manager-0.8.4/pixmaps/hicolor/24x24/actions/Makefile.am
@@ -1,4 +1,4 @@
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/24x24/action
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/24x24/actions
pixmap_DATA = $(wildcard *.png)
EXTRA_DIST = $(pixmap_DATA)
Index: virt-manager-0.8.4/pixmaps/hicolor/32x32/actions/Makefile.am
===================================================================
--- virt-manager-0.8.4.orig/pixmaps/hicolor/32x32/actions/Makefile.am
+++ virt-manager-0.8.4/pixmaps/hicolor/32x32/actions/Makefile.am
@@ -1,4 +1,4 @@
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/32x32/action
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/32x32/actions
pixmap_DATA = $(wildcard *.png)
EXTRA_DIST = $(pixmap_DATA)
++++++ virtman-device-flags.diff ++++++
--- /var/tmp/diff_new_pack.G1Jeh8/_old 2010-04-26 23:49:12.000000000 +0200
+++ /var/tmp/diff_new_pack.G1Jeh8/_new 2010-04-26 23:49:12.000000000 +0200
@@ -25,7 +25,7 @@
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/details.py
+++ virt-manager-0.8.4/src/virtManager/details.py
-@@ -1413,6 +1413,17 @@ class vmmDetails(gobject.GObject):
+@@ -1414,6 +1414,17 @@ class vmmDetails(gobject.GObject):
return
self.config.set_confirm_removedev(not skip_prompt)
++++++ virtman-keycombo.diff ++++++
--- /var/tmp/diff_new_pack.G1Jeh8/_old 2010-04-26 23:49:12.000000000 +0200
+++ /var/tmp/diff_new_pack.G1Jeh8/_new 2010-04-26 23:49:12.000000000 +0200
@@ -2,15 +2,15 @@
===================================================================
--- virt-manager-0.8.4.orig/src/vmm-details.glade
+++ virt-manager-0.8.4/src/vmm-details.glade
-@@ -339,11 +339,85 @@
+@@ -339,11 +339,93 @@
</widget>
</child>
<child>
-+ <widget class="GtkMenuItem" id="details-menu-send-assesc">
++ <widget class="GtkMenuItem" id="details-menu-send-css">
+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">Alt+Shift+Shift+Esc</property>
-+ <property name="use_underline">False</property>
-+ <signal name="activate" handler="on_details_menu_send_assesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
++ <property name="label" translatable="yes">Ctrl+_Scroll+Scroll</property>
++ <property name="use_underline">True</property>
++ <signal name="activate" handler="on_details_menu_send_css_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
@@ -59,6 +59,14 @@
+ </widget>
+ </child>
+ <child>
++ <widget class="GtkMenuItem" id="details-menu-send-assesc">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">Alt+Sh_ift+Shift+Esc</property>
++ <property name="use_underline">True</property>
++ <signal name="activate" handler="on_details_menu_send_assesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
++ </widget>
++ </child>
++ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator10">
+ <property name="visible">True</property>
+ </widget>
@@ -88,7 +96,7 @@
<widget class="GtkMenuItem" id="details-menu-send-caf1">
<property name="visible">True</property>
<property name="label">Ctrl+Alt+F_1</property>
-@@ -440,7 +514,7 @@
+@@ -440,7 +522,7 @@
</widget>
</child>
<child>
@@ -101,16 +109,17 @@
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/details.py
+++ virt-manager-0.8.4/src/virtManager/details.py
-@@ -288,6 +288,14 @@ class vmmDetails(gobject.GObject):
+@@ -288,6 +288,15 @@ class vmmDetails(gobject.GObject):
"on_details_menu_send_cad_activate": self.console.send_key,
"on_details_menu_send_cab_activate": self.console.send_key,
-+ "on_details_menu_send_assesc_activate": self.console.send_key,
++ "on_details_menu_send_css_activate": self.console.send_key,
+ "on_details_menu_send_af10_activate": self.console.send_key,
+ "on_details_menu_send_atab_activate": self.console.send_key,
+ "on_details_menu_send_aesc_activate": self.console.send_key,
+ "on_details_menu_send_cesc_activate": self.console.send_key,
+ "on_details_menu_send_caesc_activate": self.console.send_key,
++ "on_details_menu_send_assesc_activate": self.console.send_key,
+ "on_details_menu_send_f8_activate": self.console.send_key,
+ "on_details_menu_send_f10_activate": self.console.send_key,
"on_details_menu_send_caf1_activate": self.console.send_key,
@@ -120,12 +129,12 @@
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/console.py
+++ virt-manager-0.8.4/src/virtManager/console.py
-@@ -325,6 +325,22 @@ class vmmConsolePages(gobject.GObject):
+@@ -325,6 +325,24 @@ class vmmConsolePages(gobject.GObject):
keys = ["Control_L", "Alt_L", "Delete"]
elif src.get_name() == "details-menu-send-cab":
keys = ["Control_L", "Alt_L", "BackSpace"]
-+ elif src.get_name() == "details-menu-send-assesc":
-+ keys = ["Alt_R", "Shift_R", "Shift_L", "Escape"]
++ elif src.get_name() == "details-menu-send-css":
++ keys = ["Control_L", "Scroll", "Scroll"]
+ elif src.get_name() == "details-menu-send-af10":
+ keys = ["Alt_L", "F10"]
+ elif src.get_name() == "details-menu-send-atab":
@@ -136,6 +145,8 @@
+ keys = ["Control_L", "Escape"]
+ elif src.get_name() == "details-menu-send-caesc":
+ keys = ["Control_L", "Alt_L", "Escape"]
++ elif src.get_name() == "details-menu-send-assesc":
++ keys = ["Alt_R", "Shift_R", "Shift_L", "Escape"]
+ elif src.get_name() == "details-menu-send-f8":
+ keys = ["F8"]
+ elif src.get_name() == "details-menu-send-f10":
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org