Updating link to change in openSUSE:Factory/virt-manager revision 38.0

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=acab81a6e60f2c8c9cdfbd3f3fdb3437

1660-custom-icon-fix.patch

@@ -0,0 +1,49 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# 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)

virt-manager.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+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.
+
 -------------------------------------------------------------------
 Wed Mar 31 16:18:34 MDT 2010 - carnold@novell.com
 

virt-manager.spec

@@ -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 @@ Patch58:        virtman-help.diff
 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 @@ BuildRequires:  update-desktop-files
 # 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 @@ Authors:
 %prep
 %setup -q
 %setup -b 1
+%patch1 -p1
 %patch50 -p1
 %patch51 -p1
 %patch52 -p1
@@ -137,7 +138,6 @@ Authors:
 %patch59 -p1
 %patch60 -p1
 %patch61 -p1
-%patch62 -p1
 pushd $RPM_BUILD_DIR/%{virtinst_name}
 %patch81 -p1
 %patch82 -p1
@@ -182,6 +182,10 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
 
 %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 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
 %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  

virtman-device-flags.diff

@@ -25,7 +25,7 @@ Index: virt-manager-0.8.4/src/virtManager/details.py
 ===================================================================
 --- 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-icon.diff

@@ -1,12 +0,0 @@
-Index: virt-manager-0.8.4/src/virt-manager.py.in
-===================================================================
---- virt-manager-0.8.4.orig/src/virt-manager.py.in
-+++ virt-manager-0.8.4/src/virt-manager.py.in
-@@ -313,6 +313,7 @@ def main():
-     # Add our icon dir to icon theme
-     icon_theme = gtk.icon_theme_get_default()
-     icon_theme.prepend_search_path(icon_dir)
-+    icon_theme.prepend_search_path(icon_dir + "/hicolor/32x32/action")
- 
-     gtk.gdk.threads_init()
-     setup_glade_i18n()

virtman-keycombo.diff

@@ -2,15 +2,15 @@ Index: virt-manager-0.8.4/src/vmm-details.glade
 ===================================================================
 --- 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="label" translatable="yes">Ctrl+_Scroll+Scroll</property>
-+                        <property name="use_underline">False</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"/>
++                        <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 @@ Index: virt-manager-0.8.4/src/vmm-details.glade
 +                      </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 @@ Index: virt-manager-0.8.4/src/vmm-details.glade
                        <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 @@ Index: virt-manager-0.8.4/src/virtManager/details.py
 ===================================================================
 --- 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 @@ Index: virt-manager-0.8.4/src/virtManager/console.py
 ===================================================================
 --- 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":
++        elif src.get_name() == "details-menu-send-css":
-+            keys = ["Alt_R", "Shift_R", "Shift_L", "Escape"]
++            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 @@ Index: virt-manager-0.8.4/src/virtManager/console.py
 +            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":