- Add Requires on virt-manager for virt-install

- Add sles12/sled12 as supported distros

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=136
This commit is contained in:
Charles Arnold 2014-01-22 23:48:08 +00:00 committed by Git OBS Bridge
parent f45b919033
commit b0e1c35949
3 changed files with 40 additions and 13 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 22 11:03:50 MST 2014 - carnold@suse.com
- Add Requires on virt-manager for virt-install
- Add sles12/sled12 as supported distros
-------------------------------------------------------------------
Thu Jan 07 14:25:13 MDT 2014 - carnold@suse.com

View File

@ -66,9 +66,9 @@ BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define verrel %{version}-%{release}
Requires: virt-manager-common = %{verrel}
Requires: gtk3
Requires: python-gconf
Requires: virt-manager-common = %{verrel}
Requires: vm-install >= 0.5.6
# Libvirt-glib
@ -83,12 +83,13 @@ Requires: typelib-1_0-Vte-2_90
Requires: gtk-vnc2
Requires: libspice-client-glib-2_0-8
Requires: libspice-client-gtk-3_0-4
Requires: typelib-1_0-GVnc-1_0
Requires: typelib-1_0-Gtk-3_0
Requires: typelib-1_0-GtkVnc-2_0
Requires: typelib-1_0-SpiceClientGlib-2_0
Requires: typelib-1_0-SpiceClientGtk-3_0
Requires: typelib-1_0-Gtk-3_0
Requires: typelib-1_0-GVnc-1_0
Requires: typelib-1_0-GtkVnc-2_0
Recommends: python-SpiceClientGtk
Requires: virt-install
%if %{with_guestfs}
Requires: python-libguestfs
@ -114,8 +115,8 @@ Group: System/Monitoring
# This version not strictly required: virt-manager should work with older,
# however varying amounts of functionality will not be enabled.
Requires: libvirt-python >= 0.7.0
Requires: python-ipaddr
Requires: python-urlgrabber
Requires: python-ipaddr
%description common
Common files used by the different virt-manager interfaces, as well as
@ -128,10 +129,10 @@ Group: System/Monitoring
Requires: virt-manager-common = %{verrel}
Provides: python-virtinst
Provides: virt-clone
Provides: virt-convert
Provides: virt-image
Provides: virt-convert
Provides: python-virtinst
Obsoletes: python-virtinst <= 0.600.4
%description -n virt-install

View File

@ -2,7 +2,7 @@ Index: virt-manager-0.10.0/virtinst/osdict.py
===================================================================
--- virt-manager-0.10.0.orig/virtinst/osdict.py
+++ virt-manager-0.10.0/virtinst/osdict.py
@@ -408,33 +408,93 @@ OS_TYPES = {
@@ -408,33 +408,113 @@ OS_TYPES = {
},
"opensuse11": {
@ -81,6 +81,16 @@ Index: virt-manager-0.10.0/virtinst/osdict.py
+ NET : VIRTIO_NET,
+ },
+ },
+ "sles12": {
+ "label": "Suse Linux Enterprise Server 12",
+ "distro": "suse",
+ "supported": True,
+ "pv_cdrom_install": True,
+ "devices" : {
+ DISK : VIRTIO_DISK,
+ NET : VIRTIO_NET,
+ },
+ },
+
+ "sled10": {
+ "label": "Suse Linux Enterprise Desktop 10",
@ -95,11 +105,21 @@ Index: virt-manager-0.10.0/virtinst/osdict.py
+ "label": "Suse Linux Enterprise Desktop 11",
+ "distro": "suse",
+ "supported": True,
+ "pv_cdrom_install": True,
+ "devices" : {
+ DISK : VIRTIO_DISK,
+ NET : VIRTIO_NET,
+ },
+ },
+ "sled12": {
+ "label": "Suse Linux Enterprise Desktop 12",
+ "distro": "suse",
+ "supported": True,
+ "pv_cdrom_install": True,
"devices" : {
DISK : VIRTIO_DISK,
NET : VIRTIO_NET,
@@ -619,6 +679,12 @@ OS_TYPES = {
@@ -619,6 +699,12 @@ OS_TYPES = {
VIDEO : VMVGA_VIDEO,
},
},
@ -112,7 +132,7 @@ Index: virt-manager-0.10.0/virtinst/osdict.py
"generic24": {
"label": "Generic 2.4.x kernel"
@@ -682,6 +748,12 @@ OS_TYPES = {
@@ -682,6 +768,12 @@ OS_TYPES = {
"sortby": "mswinserv2008",
"distro": "winserv",
},
@ -125,7 +145,7 @@ Index: virt-manager-0.10.0/virtinst/osdict.py
"vista": {
"label": "Microsoft Windows Vista",
"supported": True,
@@ -694,6 +766,12 @@ OS_TYPES = {
@@ -694,6 +786,12 @@ OS_TYPES = {
"sortby": "mswin7",
"distro": "win",
},
@ -138,7 +158,7 @@ Index: virt-manager-0.10.0/virtinst/osdict.py
},
},
@@ -770,6 +848,13 @@ OS_TYPES = {
@@ -770,6 +868,13 @@ OS_TYPES = {
"apic": False,
},
@ -152,7 +172,7 @@ Index: virt-manager-0.10.0/virtinst/osdict.py
"netware4": {
"label": "Novell Netware 4",
},
@@ -778,6 +863,7 @@ OS_TYPES = {
@@ -778,6 +883,7 @@ OS_TYPES = {
},
"netware6": {
"label": "Novell Netware 6",