- virtinst-storage-ocfs2.diff (Xin Wei Hu)

* add ocfs2 to  pool of dir (Filesystem Directory) type in libvirt

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

virt-manager-0.8.3.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d52982d3693333619fe9b5b721b8ab554f5d3cdeb64754b59c38522b5411079
+oid sha256:e7b55303a65a4e0bbbfa8c4e63b06e4b66a23afa490faa5fccc1251428ea6b1f
-size 1534248
+size 1521896

virt-manager.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 23 14:20:52 CST 2010 - jsong@novell.com
+
+- virtinst-storage-ocfs2.diff (Xin Wei Hu) 
+  * add ocfs2 to  pool of dir (Filesystem Directory) type in libvirt
+
 -------------------------------------------------------------------
 Mon Feb 15 23:24:12 UTC 2010 - chris@computersalat.de
 

virt-manager.spec

@@ -20,17 +20,17 @@
 %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
 %define gsysconfdir /etc
 %define gconftool /usr/bin/gconftool-2
-%define vi_maj 0
+%define virtinst_maj 0
-%define vi_min 500
+%define virtinst_min 500
-%define vi_rel 2
+%define virtinst_rel 2
-%define virtinst_name virtinst-%{vi_maj}.%{vi_min}.%{vi_rel}
+%define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
 
 Name:           virt-manager
 Summary:        Virtual Machine Manager
 Version:        0.8.3
-Release:        1
+Release:        4
 Group:          System/Monitoring
-License:        LGPLv2.1+
+License:        LGPL v2.1 or later
 Url:            http://virt-manager.et.redhat.com
 Source0:        virt-manager-%{version}.tar.bz2
 Source1:        %{virtinst_name}.tar.bz2
@@ -46,6 +46,7 @@ Patch58:        virtman-help.diff
 Patch59:        virtman-keycombo.diff
 Patch60:        virtman-autoconnect.diff
 Patch81:        virtinst-cdrom.diff
+Patch82:        virtinst-storage-ocfs2.diff
 ExclusiveArch:  %{ix86} x86_64
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
@@ -135,6 +136,7 @@ Authors:
 %patch60 -p1
 pushd $RPM_BUILD_DIR/%{virtinst_name}
 %patch81 -p1
+%patch82 -p1
 popd
 # sed -i -e "s@sr\@Latn@sr\@latin@" configure
 # mv po/sr@Latn.po po/sr@latin.po
@@ -170,7 +172,6 @@ rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-image.1
 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-install.1
 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-convert.1
 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/virt-image.5
-# rm -f $RPM_BUILD_ROOT/usr/share/virt-manager/virtinst-0.500.3-py2.?.egg-info
 popd
 #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a
 #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la

virtinst-0.500.2.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b82098c10ef1a03e8bb7904c20357c968d81e06a8e8905563713c4dae47b8c77
+oid sha256:671204f7276af791d92f4442c24898aa234cfa64864c4923e9a6269efea86b26
-size 321831
+size 309222

virtinst-cdrom.diff

@@ -1,10 +1,10 @@
-Index: virtinst-0.500.1/virtinst/VirtualDisk.py
+Index: virtinst-0.500.2/virtinst/VirtualDisk.py
 ===================================================================
---- virtinst-0.500.1.orig/virtinst/VirtualDisk.py
+--- virtinst-0.500.2.orig/virtinst/VirtualDisk.py
-+++ virtinst-0.500.1/virtinst/VirtualDisk.py
++++ virtinst-0.500.2/virtinst/VirtualDisk.py
-@@ -1354,14 +1354,18 @@ class VirtualDisk(VirtualDevice):
+@@ -1370,14 +1370,18 @@ class VirtualDisk(VirtualDevice):
+                 self.target = "hdc"
                  return self.target
-             raise ValueError(_("IDE CDROM must use 'hdc', but target in use."))
  
 -        # Regular scanning
 +	# Start cdrom at 'c' and skip 'c' for non-cdrom

virtinst-storage-ocfs2.diff

@@ -0,0 +1,11 @@
+--- virtinst-0.500.2.orig/virtinst/Storage.py	Tue Feb 23 13:54:26 2010 +0800
++++ virtinst-0.500.2/virtinst/Storage.py	Tue Feb 23 13:58:59 2010 +0800
+@@ -519,7 +519,7 @@
+     get_volume_class = staticmethod(get_volume_class)
+ 
+     formats = [ "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf",
+-                "gfs", "gfs2", "vfat", "hfs+", "xfs" ]
++                "gfs", "gfs2", "vfat", "hfs+", "xfs", "ocfs2" ]
+ 
+     # Register applicable property methods from parent class
+     perms = property(StorageObject.get_perms, StorageObject.set_perms)

virtman-autoconnect.diff

@@ -1,8 +1,8 @@
-Index: virt-manager-0.8.2/src/virtManager/engine.py
+Index: virt-manager-0.8.3/src/virtManager/engine.py
 ===================================================================
---- virt-manager-0.8.2.orig/src/virtManager/engine.py
+--- virt-manager-0.8.3.orig/src/virtManager/engine.py
-+++ virt-manager-0.8.2/src/virtManager/engine.py
++++ virt-manager-0.8.3/src/virtManager/engine.py
-@@ -470,7 +470,7 @@ class vmmEngine(gobject.GObject):
+@@ -471,7 +471,7 @@ class vmmEngine(gobject.GObject):
          self.emit("connection-added", conn)
          self.config.add_connection(conn.get_uri())
          if autoconnect:

virtman-cdrom.diff

@@ -1,7 +1,7 @@
-Index: virt-manager-0.8.2/src/virtManager/addhardware.py
+Index: virt-manager-0.8.3/src/virtManager/addhardware.py
 ===================================================================
---- virt-manager-0.8.2.orig/src/virtManager/addhardware.py
+--- virt-manager-0.8.3.orig/src/virtManager/addhardware.py
-+++ virt-manager-0.8.2/src/virtManager/addhardware.py
++++ virt-manager-0.8.3/src/virtManager/addhardware.py
 @@ -465,6 +465,7 @@ class vmmAddHardware(gobject.GObject):
          if self.vm.get_hv_type() == "kvm":
              add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk")

virtman-desktop.diff

@@ -1,7 +1,7 @@
-Index: virt-manager-0.8.2/src/Makefile.am
+Index: virt-manager-0.8.3/src/Makefile.am
 ===================================================================
---- virt-manager-0.8.2.orig/src/Makefile.am
+--- virt-manager-0.8.3.orig/src/Makefile.am
-+++ virt-manager-0.8.2/src/Makefile.am
++++ virt-manager-0.8.3/src/Makefile.am
 @@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
  gladedir = $(pkgdatadir)
  glade_DATA = $(wildcard $(srcdir)/*.glade)
@@ -11,10 +11,10 @@ Index: virt-manager-0.8.2/src/Makefile.am
  desktop_DATA_IN = $(PACKAGE).desktop.in.in
  desktop_DATA = $(PACKAGE).desktop
  
-Index: virt-manager-0.8.2/src/Makefile.in
+Index: virt-manager-0.8.3/src/Makefile.in
 ===================================================================
---- virt-manager-0.8.2.orig/src/Makefile.in
+--- virt-manager-0.8.3.orig/src/Makefile.in
-+++ virt-manager-0.8.2/src/Makefile.in
++++ virt-manager-0.8.3/src/Makefile.in
 @@ -240,7 +240,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
  libexec_SCRIPTS = $(PACKAGE)-launch
  gladedir = $(pkgdatadir)
@@ -24,10 +24,10 @@ Index: virt-manager-0.8.2/src/Makefile.in
  desktop_DATA_IN = $(PACKAGE).desktop.in.in
  desktop_DATA = $(PACKAGE).desktop
  dbusdir = $(datadir)/dbus-1/services
-Index: virt-manager-0.8.2/src/virt-manager.desktop.in.in
+Index: virt-manager-0.8.3/src/virt-manager.desktop.in.in
 ===================================================================
---- virt-manager-0.8.2.orig/src/virt-manager.desktop.in.in
+--- virt-manager-0.8.3.orig/src/virt-manager.desktop.in.in
-+++ virt-manager-0.8.2/src/virt-manager.desktop.in.in
++++ virt-manager-0.8.3/src/virt-manager.desktop.in.in
 @@ -1,9 +1,20 @@
  [Desktop Entry]
  _Name=Virtual Machine Manager

virtman-help.diff

@@ -1,7 +1,7 @@
-Index: virt-manager-0.8.2/help/virt-manager/C/virt-manager.xml
+Index: virt-manager-0.8.3/help/virt-manager/C/virt-manager.xml
 ===================================================================
---- virt-manager-0.8.2.orig/help/virt-manager/C/virt-manager.xml
+--- virt-manager-0.8.3.orig/help/virt-manager/C/virt-manager.xml
-+++ virt-manager-0.8.2/help/virt-manager/C/virt-manager.xml
++++ virt-manager-0.8.3/help/virt-manager/C/virt-manager.xml
 @@ -821,218 +821,9 @@
    <title>The Create Wizard</title>
    <para>The Create Wizard helps you gather the information necessary to create

virtman-keycombo.diff

@@ -1,7 +1,7 @@
-Index: virt-manager-0.8.2/src/vmm-details.glade
+Index: virt-manager-0.8.3/src/vmm-details.glade
 ===================================================================
---- virt-manager-0.8.2.orig/src/vmm-details.glade
+--- virt-manager-0.8.3.orig/src/vmm-details.glade
-+++ virt-manager-0.8.2/src/vmm-details.glade
++++ virt-manager-0.8.3/src/vmm-details.glade
 @@ -339,11 +339,85 @@
                        </widget>
                      </child>
@@ -97,11 +97,11 @@ Index: virt-manager-0.8.2/src/vmm-details.glade
                          <property name="visible">True</property>
                        </widget>
                      </child>
-Index: virt-manager-0.8.2/src/virtManager/details.py
+Index: virt-manager-0.8.3/src/virtManager/details.py
 ===================================================================
---- virt-manager-0.8.2.orig/src/virtManager/details.py
+--- virt-manager-0.8.3.orig/src/virtManager/details.py
-+++ virt-manager-0.8.2/src/virtManager/details.py
++++ virt-manager-0.8.3/src/virtManager/details.py
-@@ -240,6 +240,14 @@ class vmmDetails(gobject.GObject):
+@@ -259,6 +259,14 @@ class vmmDetails(gobject.GObject):
  
              "on_details_menu_send_cad_activate": self.console.send_key,
              "on_details_menu_send_cab_activate": self.console.send_key,
@@ -116,10 +116,10 @@ Index: virt-manager-0.8.2/src/virtManager/details.py
              "on_details_menu_send_caf1_activate": self.console.send_key,
              "on_details_menu_send_caf2_activate": self.console.send_key,
              "on_details_menu_send_caf3_activate": self.console.send_key,
-Index: virt-manager-0.8.2/src/virtManager/console.py
+Index: virt-manager-0.8.3/src/virtManager/console.py
 ===================================================================
---- virt-manager-0.8.2.orig/src/virtManager/console.py
+--- virt-manager-0.8.3.orig/src/virtManager/console.py
-+++ virt-manager-0.8.2/src/virtManager/console.py
++++ virt-manager-0.8.3/src/virtManager/console.py
 @@ -321,6 +321,22 @@ class vmmConsolePages(gobject.GObject):
              keys = ["Control_L", "Alt_L", "Delete"]
          elif src.get_name() == "details-menu-send-cab":

virtman-kvm.diff

@@ -1,8 +1,8 @@
-Index: virt-manager-0.8.2/src/virt-manager.py.in
+Index: virt-manager-0.8.3/src/virt-manager.py.in
 ===================================================================
---- virt-manager-0.8.2.orig/src/virt-manager.py.in
+--- virt-manager-0.8.3.orig/src/virt-manager.py.in
-+++ virt-manager-0.8.2/src/virt-manager.py.in
++++ virt-manager-0.8.3/src/virt-manager.py.in
-@@ -198,7 +198,8 @@ def default_uri():
+@@ -209,7 +209,8 @@ def default_uri():
          tryuri = "xen:///"
      elif (os.path.exists("/usr/bin/qemu") or
            os.path.exists("/usr/bin/qemu-kvm") or

virtman-netcat.diff

@@ -1,8 +1,8 @@
-Index: virt-manager-0.8.2/src/virtManager/console.py
+Index: virt-manager-0.8.3/src/virtManager/console.py
 ===================================================================
---- virt-manager-0.8.2.orig/src/virtManager/console.py
+--- virt-manager-0.8.3.orig/src/virtManager/console.py
-+++ virt-manager-0.8.2/src/virtManager/console.py
++++ virt-manager-0.8.3/src/virtManager/console.py
-@@ -506,7 +506,7 @@ class vmmConsolePages(gobject.GObject):
+@@ -505,7 +505,7 @@ class vmmConsolePages(gobject.GObject):
          if username:
              argv += ['-l', username]
  

virtman-vminstall.diff

@@ -1,7 +1,7 @@
-Index: virt-manager-0.8.2/src/virtManager/engine.py
+Index: virt-manager-0.8.3/src/virtManager/engine.py
 ===================================================================
---- virt-manager-0.8.2.orig/src/virtManager/engine.py
+--- virt-manager-0.8.3.orig/src/virtManager/engine.py
-+++ virt-manager-0.8.2/src/virtManager/engine.py
++++ virt-manager-0.8.3/src/virtManager/engine.py
 @@ -38,7 +38,8 @@ from virtManager.manager import vmmManag
  from virtManager.migrate import vmmMigrateDialog
  from virtManager.details import vmmDetails
@@ -12,7 +12,7 @@ Index: virt-manager-0.8.2/src/virtManager/engine.py
  from virtManager.host import vmmHost
  from virtManager.error import vmmErrorDialog
  from virtManager.systray import vmmSystray
-@@ -435,13 +436,24 @@ class vmmEngine(gobject.GObject):
+@@ -436,13 +437,24 @@ class vmmEngine(gobject.GObject):
              return False
          return True