Accepting request 33598 from Virtualization

checked in (request 33598)

OBS-URL: https://build.opensuse.org/request/show/33598
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=17
This commit is contained in:
OBS User autobuild 2010-03-01 00:50:01 +00:00 committed by Git OBS Bridge
parent b6d3df316d
commit 3a3978d854
16 changed files with 81 additions and 124 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44f3e519532ee1600db69ce2dcb118aaa20ebf1c12b375e5524a6876c6589f0c
size 1480196

View File

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

View File

@ -1,30 +1,3 @@
-------------------------------------------------------------------
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
- Update to virt-manager version 0.8.3
* New ability to manage network interfaces: start, stop, and view
existing interfaces. Provision new bridge, bond, and vlan devices.
* New option to 'customize VM before install', which allows
adjusting most VM options from the install wizard.
- Update to virtinst version 0.500.2
* virt-install: New option --autostart for setting domain
autostart flag
* virt-install: Allow specifying --host-device with lsusb and
lspci format (0x1234:0x5678 for USB, etc)
* virtinst: New 'Interface' module for building libvirt
interface XML
- cleanup spec
* norootforbuild
* sort TAGS
- some rpmlint stuff
* configfile
-------------------------------------------------------------------
Thu Jan 7 12:04:09 MST 2010 - carnold@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package virt-manager (Version 0.8.3)
# spec file for package virt-manager (Version 0.8.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -15,23 +15,24 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: virt-manager
%define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
%define gsysconfdir /etc
%define gconftool /usr/bin/gconftool-2
%define virtinst_maj 0
%define virtinst_min 500
%define virtinst_rel 2
%define virtinst_rel 1
%define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
Name: virt-manager
Version: 0.8.2
Release: 1
Summary: Virtual Machine Manager
Version: 0.8.3
Release: 4
Group: System/Monitoring
License: LGPL v2.1 or later
License: LGPLv2.1+
Url: http://virt-manager.et.redhat.com
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64
Source0: virt-manager-%{version}.tar.bz2
Source1: %{virtinst_name}.tar.bz2
Patch50: virtman-desktop.diff
@ -46,28 +47,6 @@ 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
#
#rpmlint BuildRequires: python
BuildRequires: gtk2-devel
BuildRequires: python-devel
BuildRequires: gettext
BuildRequires: scrollkeeper
BuildRequires: intltool
#rpmlint BuildRequires: python-gtk
BuildRequires: python-gtk-devel
BuildRequires: python-gobject2-devel
BuildRequires: gconf2-devel
BuildRequires: desktop-file-utils
BuildRequires: update-desktop-files
# virtinst BuildRequires
BuildRequires: libxml2-python
BuildRequires: python-urlgrabber
BuildRequires: libvirt-python
#
# Requires: pygtk2 >= 1.99.12-6
Requires: python-gtk
# Requires: gnome-python2-gconf >= 1.99.11-7
@ -107,6 +86,23 @@ Requires: netcat
# Add requires for non Xen installations
Requires: python-urlgrabber
Requires: vm-install
#rpmlint BuildRequires: python
BuildRequires: gtk2-devel
BuildRequires: python-devel
BuildRequires: gettext
BuildRequires: scrollkeeper
BuildRequires: intltool
#rpmlint BuildRequires: python-gtk
BuildRequires: python-gtk-devel
BuildRequires: python-gobject2-devel
BuildRequires: gconf2-devel
BuildRequires: desktop-file-utils
BuildRequires: update-desktop-files
# virtinst BuildRequires
BuildRequires: libxml2-python
BuildRequires: python-urlgrabber
BuildRequires: libvirt-python
%gconf_schemas_prereq
%description
Virtual Machine Manager provides a graphical tool for administering
@ -136,7 +132,6 @@ 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
@ -162,7 +157,6 @@ rm -f $RPM_BUILD_ROOT/usr/share/locale/pl/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/fr/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/it/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/sr/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/ru/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/pt_BR/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/sr@latin/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/virtinst.mo
@ -172,6 +166,7 @@ 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
@ -207,7 +202,7 @@ 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
%{gsysconfdir}/gconf/schemas/%{name}.schemas
%endif
%{_bindir}/%{name}
%{_libexecdir}/%{name}-launch
@ -238,7 +233,7 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
%dir %{_datadir}/%{name}/virtconv/parsers
%{_datadir}/%{name}/virtconv/parsers/*.py
%{_datadir}/%{name}/virtconv/parsers/*.pyc
%{_datadir}/%{name}/%{virtinst_name}-py2.6.egg-info
%{_datadir}/%{name}/virtinst-0.500.1-py2.6.egg-info
%doc %{_datadir}/gnome/help/%{name}/C/figures/*.png
%doc %{_datadir}/gnome/help/%{name}/C/*.xml
# FIXME: autobuild complains that these are unowned (not true...)

3
virtinst-0.500.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76950b4ff6f11764ad851859ac65cdf248027ea557fbe4b3eeb4cfae6d67b1bd
size 291489

View File

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

View File

@ -1,10 +1,10 @@
Index: virtinst-0.500.2/virtinst/VirtualDisk.py
Index: virtinst-0.500.1/virtinst/VirtualDisk.py
===================================================================
--- virtinst-0.500.2.orig/virtinst/VirtualDisk.py
+++ virtinst-0.500.2/virtinst/VirtualDisk.py
@@ -1370,14 +1370,18 @@ class VirtualDisk(VirtualDevice):
self.target = "hdc"
--- virtinst-0.500.1.orig/virtinst/VirtualDisk.py
+++ virtinst-0.500.1/virtinst/VirtualDisk.py
@@ -1354,14 +1354,18 @@ class VirtualDisk(VirtualDevice):
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

View File

@ -1,11 +0,0 @@
--- 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)

View File

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

View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.3/src/virtManager/addhardware.py
Index: virt-manager-0.8.2/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.3/src/virtManager/addhardware.py
--- virt-manager-0.8.2.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.2/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")

View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.3/src/Makefile.am
Index: virt-manager-0.8.2/src/Makefile.am
===================================================================
--- virt-manager-0.8.3.orig/src/Makefile.am
+++ virt-manager-0.8.3/src/Makefile.am
--- virt-manager-0.8.2.orig/src/Makefile.am
+++ virt-manager-0.8.2/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.3/src/Makefile.am
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
Index: virt-manager-0.8.3/src/Makefile.in
Index: virt-manager-0.8.2/src/Makefile.in
===================================================================
--- virt-manager-0.8.3.orig/src/Makefile.in
+++ virt-manager-0.8.3/src/Makefile.in
--- virt-manager-0.8.2.orig/src/Makefile.in
+++ virt-manager-0.8.2/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.3/src/Makefile.in
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
dbusdir = $(datadir)/dbus-1/services
Index: virt-manager-0.8.3/src/virt-manager.desktop.in.in
Index: virt-manager-0.8.2/src/virt-manager.desktop.in.in
===================================================================
--- virt-manager-0.8.3.orig/src/virt-manager.desktop.in.in
+++ 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.2/src/virt-manager.desktop.in.in
@@ -1,9 +1,20 @@
[Desktop Entry]
_Name=Virtual Machine Manager

View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.3/help/virt-manager/C/virt-manager.xml
Index: virt-manager-0.8.2/help/virt-manager/C/virt-manager.xml
===================================================================
--- virt-manager-0.8.3.orig/help/virt-manager/C/virt-manager.xml
+++ 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.2/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

View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.3/src/vmm-details.glade
Index: virt-manager-0.8.2/src/vmm-details.glade
===================================================================
--- virt-manager-0.8.3.orig/src/vmm-details.glade
+++ virt-manager-0.8.3/src/vmm-details.glade
--- virt-manager-0.8.2.orig/src/vmm-details.glade
+++ virt-manager-0.8.2/src/vmm-details.glade
@@ -339,11 +339,85 @@
</widget>
</child>
@ -97,11 +97,11 @@ Index: virt-manager-0.8.3/src/vmm-details.glade
<property name="visible">True</property>
</widget>
</child>
Index: virt-manager-0.8.3/src/virtManager/details.py
Index: virt-manager-0.8.2/src/virtManager/details.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/details.py
+++ virt-manager-0.8.3/src/virtManager/details.py
@@ -259,6 +259,14 @@ class vmmDetails(gobject.GObject):
--- virt-manager-0.8.2.orig/src/virtManager/details.py
+++ virt-manager-0.8.2/src/virtManager/details.py
@@ -240,6 +240,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.3/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.3/src/virtManager/console.py
Index: virt-manager-0.8.2/src/virtManager/console.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/console.py
+++ virt-manager-0.8.3/src/virtManager/console.py
--- virt-manager-0.8.2.orig/src/virtManager/console.py
+++ virt-manager-0.8.2/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":

View File

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

View File

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

View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.3/src/virtManager/engine.py
Index: virt-manager-0.8.2/src/virtManager/engine.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/engine.py
+++ virt-manager-0.8.3/src/virtManager/engine.py
--- virt-manager-0.8.2.orig/src/virtManager/engine.py
+++ virt-manager-0.8.2/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.3/src/virtManager/engine.py
from virtManager.host import vmmHost
from virtManager.error import vmmErrorDialog
from virtManager.systray import vmmSystray
@@ -436,13 +437,24 @@ class vmmEngine(gobject.GObject):
@@ -435,13 +436,24 @@ class vmmEngine(gobject.GObject):
return False
return True