From 0e7e6567ce381c94c6df8db115303cbec7df8541 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 31 Aug 2015 15:44:26 +0000 Subject: [PATCH 1/7] Use gobject-introspection for suse_version >= 1315 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=251 --- virt-manager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-manager.spec b/virt-manager.spec index e3e80d0b..b2234c6e 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -116,7 +116,7 @@ Requires: python-libguestfs %endif BuildRequires: glib2-devel -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1315 BuildRequires: gobject-introspection %endif BuildRequires: intltool From a67df0f6e9196bba78fae2dcf1acc458bd9b7444 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Wed, 2 Sep 2015 20:04:59 +0000 Subject: [PATCH 2/7] - Drop virtinst-fix-storage-pool-lookup.patch in favor of upstream version (bsc#941464). eb92178e-virtinst-fix-storage-pool-lookup.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=252 --- ...78e-virtinst-fix-storage-pool-lookup.patch | 25 +++++++++++++------ virt-manager.changes | 7 ++++++ virt-manager.spec | 4 +-- virtinst-storage-ocfs2.patch | 2 +- virtinst-vol-default-nocow.patch | 2 +- 5 files changed, 29 insertions(+), 11 deletions(-) rename virtinst-fix-storage-pool-lookup.patch => eb92178e-virtinst-fix-storage-pool-lookup.patch (51%) diff --git a/virtinst-fix-storage-pool-lookup.patch b/eb92178e-virtinst-fix-storage-pool-lookup.patch similarity index 51% rename from virtinst-fix-storage-pool-lookup.patch rename to eb92178e-virtinst-fix-storage-pool-lookup.patch index b1447292..38b7b6de 100644 --- a/virtinst-fix-storage-pool-lookup.patch +++ b/eb92178e-virtinst-fix-storage-pool-lookup.patch @@ -1,4 +1,8 @@ -References: bsc#941464 +Subject: storage: fix default storage pool lookup +From: Charles Arnold carnold@suse.com Wed Aug 12 16:00:14 2015 -0600 +Date: Mon Aug 31 18:25:37 2015 -0400: +Git: eb92178e0c208c20c658dd3f38caf377bb788ae4 + virt-convert fails when the storage pool is already present but is not called 'default'. @@ -6,19 +10,26 @@ If the 'default' pool has been removed but another pool uses the default location of /var/lib/libvirt/images virt-convert will fail to find the pool and attempt to create another one with the same path. This causes the conversion to fail. -Index: virt-manager-1.2.1/virtinst/storage.py -=================================================================== ---- virt-manager-1.2.1.orig/virtinst/storage.py -+++ virt-manager-1.2.1/virtinst/storage.py -@@ -209,10 +209,11 @@ class StoragePool(_StorageObject): + +Signed-off-by: Charles Arnold + +(crobinso: Remove now-redundant 'pass') + +diff --git a/virtinst/storage.py b/virtinst/storage.py +index 285acb8..d3d867a 100644 +--- a/virtinst/storage.py ++++ b/virtinst/storage.py +@@ -209,10 +209,12 @@ class StoragePool(_StorageObject): try: pool = conn.storagePoolLookupByName(name) except libvirt.libvirtError: +- pass ++ # Try default pool path when "default" name fails + pool = StoragePool.lookup_pool_by_path(conn, path) - pass if pool: - return ++ # This is a libvirt pool object so create a StoragePool from it + return StoragePool(conn, parsexml=pool.XMLDesc(0)) try: diff --git a/virt-manager.changes b/virt-manager.changes index bd1f3567..2565a774 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 31 16:41:28 MDT 2015 - carnold@suse.com + +- Drop virtinst-fix-storage-pool-lookup.patch in favor of upstream + version (bsc#941464). + eb92178e-virtinst-fix-storage-pool-lookup.patch + ------------------------------------------------------------------- Wed Aug 26 15:32:59 MDT 2015 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index b2234c6e..4af379a6 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -45,6 +45,7 @@ Patch5: a9b303fb-fix-copy-host-cpu-definition.patch Patch6: f81358b0-dont-display-error-if-machine-is-missing-in-XML.patch Patch7: aebebbf8-report-an-error-for-pxe-install-without-network.patch Patch8: 4970615f-fix-qemu-vs-lxc-detection.patch +Patch9: eb92178e-virtinst-fix-storage-pool-lookup.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -85,7 +86,6 @@ Patch160: virtinst-xen-drive-type.patch Patch161: virtinst-xenbus-disk-index-fix.patch Patch162: virtinst-refresh_before_fetch_pool.patch Patch163: virtinst-replace-unar-with-other-archivers.patch -Patch164: virtinst-fix-storage-pool-lookup.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -178,6 +178,7 @@ machine). %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 @@ -218,7 +219,6 @@ machine). %patch161 -p1 %patch162 -p1 %patch163 -p1 -%patch164 -p1 %build %if %{qemu_user} diff --git a/virtinst-storage-ocfs2.patch b/virtinst-storage-ocfs2.patch index 7d3e2e03..963dd1ee 100644 --- a/virtinst-storage-ocfs2.patch +++ b/virtinst-storage-ocfs2.patch @@ -3,7 +3,7 @@ Index: virt-manager-1.2.1/virtinst/storage.py =================================================================== --- virt-manager-1.2.1.orig/virtinst/storage.py +++ virt-manager-1.2.1/virtinst/storage.py -@@ -447,7 +447,7 @@ class StoragePool(_StorageObject): +@@ -449,7 +449,7 @@ class StoragePool(_StorageObject): def list_formats(self): if self.type == self.TYPE_FS: return ["auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", diff --git a/virtinst-vol-default-nocow.patch b/virtinst-vol-default-nocow.patch index 8e9ac7fa..c9ee28c7 100644 --- a/virtinst-vol-default-nocow.patch +++ b/virtinst-vol-default-nocow.patch @@ -8,7 +8,7 @@ Index: virt-manager-1.2.1/virtinst/storage.py =================================================================== --- virt-manager-1.2.1.orig/virtinst/storage.py +++ virt-manager-1.2.1/virtinst/storage.py -@@ -716,6 +716,11 @@ class StorageVolume(_StorageObject): +@@ -718,6 +718,11 @@ class StorageVolume(_StorageObject): lazy_refcounts = XMLProperty("./target/features/lazy_refcounts", is_bool=True, default_cb=_lazy_refcounts_default_cb) From f84708fe4977b0c9c312dd15659b2ba85b5c08af Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Fri, 4 Sep 2015 14:36:51 +0000 Subject: [PATCH 3/7] Fix windows media detection OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=253 --- virt-manager.spec | 6 ++-- virtinst-detect-windows-media.patch | 46 ++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/virt-manager.spec b/virt-manager.spec index 4af379a6..0c9aec7e 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,7 +1,7 @@ # # spec file for package virt-manager # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu" @@ -99,6 +98,7 @@ Requires: virt-manager-common = %{verrel} Requires: vm-install >= 0.5.6 # Typelib's +Recommends: typelib(AppIndicator3) Requires: typelib(GVnc) Requires: typelib(GtkVnc) Requires: typelib(LibvirtGLib) @@ -116,7 +116,7 @@ Requires: python-libguestfs %endif BuildRequires: glib2-devel -%if 0%{?suse_version} >= 1315 +%if 0%{?suse_version} > 1315 BuildRequires: gobject-introspection %endif BuildRequires: intltool diff --git a/virtinst-detect-windows-media.patch b/virtinst-detect-windows-media.patch index 363e2f00..9a9af51c 100644 --- a/virtinst-detect-windows-media.patch +++ b/virtinst-detect-windows-media.patch @@ -1,10 +1,10 @@ Enhancement to detect windows media. It is based solely upon finding an autorun.inf file in the root of the installation source. It only assumes windows, not the specific version of windows. -Index: virt-manager-1.2.0/virtinst/urlfetcher.py +Index: virt-manager-1.2.1/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.2.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.2.0/virtinst/urlfetcher.py +--- virt-manager-1.2.1.orig/virtinst/urlfetcher.py ++++ virt-manager-1.2.1/virtinst/urlfetcher.py @@ -408,6 +408,24 @@ def _distroFromSUSEContent(fetcher, arch return ob @@ -48,10 +48,48 @@ Index: virt-manager-1.2.0/virtinst/urlfetcher.py +class WindowsDistro(Distro): + + urldistro = "windows" -+ os_variant = "win8.1" ++ os_variant = "win2k12r2" + + def isValidStore(self): + return False # Build list of all *Distro classes def _build_distro_list(): +Index: virt-manager-1.2.1/virtinst/distroinstaller.py +=================================================================== +--- virt-manager-1.2.1.orig/virtinst/distroinstaller.py ++++ virt-manager-1.2.1/virtinst/distroinstaller.py +@@ -499,21 +499,25 @@ class DistroInstaller(Installer): + + def detect_distro(self, guest): + distro = None ++ def _get_distro(guest): ++ try: ++ fetcher = self._get_fetcher(guest, None) ++ fetcher.prepareLocation() ++ ++ store = self._get_store(guest, fetcher) ++ return store.get_osdict_info() ++ finally: ++ fetcher.cleanupLocation() + try: + if _is_url(self.conn, self.location): +- try: +- fetcher = self._get_fetcher(guest, None) +- fetcher.prepareLocation() +- +- store = self._get_store(guest, fetcher) +- distro = store.get_osdict_info() +- finally: +- fetcher.cleanupLocation() ++ distro = _get_distro(guest) + elif self.conn.is_remote(): + logging.debug("Can't detect distro for media on " + "remote connection.") + else: + distro = OSDB.lookup_os_by_media(self.location) ++ if distro is None: ++ distro = _get_distro(guest) + except: + logging.debug("Error attempting to detect distro.", exc_info=True) + From 3f42ed6e48bb0e65bab6ad932982c6ffed153b45 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Fri, 4 Sep 2015 17:06:37 +0000 Subject: [PATCH 4/7] - bsc#944374 - virt-manager uninstallable on aarch64 virt-manager.spec - Add upstream bug fix 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=254 --- ...fc-dont-try-to-set-vmport-on-non-x86.patch | 68 +++++++++++++++++++ virt-manager.changes | 8 +++ virt-manager.spec | 5 +- virtman-add-s390x-arch-support.patch | 2 +- 4 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch diff --git a/5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch b/5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch new file mode 100644 index 00000000..2381ae89 --- /dev/null +++ b/5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch @@ -0,0 +1,68 @@ +Subject: guest: Don't try to set vmport on non-x86, it isn't supported (bz 1259998) +From: Cole Robinson crobinso@redhat.com Fri Sep 4 12:14:22 2015 -0400 +Date: Fri Sep 4 12:14:22 2015 -0400: +Git: 5e68b0fc3d9b93491817a3c1914fa9b3633440b6 + + +Index: virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml +=================================================================== +--- virt-manager-1.2.1.orig/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml ++++ virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml +@@ -8,12 +8,6 @@ + hvm + + +- +- +- +- +- +- + + destroy + restart +Index: virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml +=================================================================== +--- virt-manager-1.2.1.orig/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml ++++ virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml +@@ -8,12 +8,6 @@ + hvm + + +- +- +- +- +- +- + + destroy + restart +Index: virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml +=================================================================== +--- virt-manager-1.2.1.orig/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml ++++ virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml +@@ -8,11 +8,6 @@ + hvm + + +- +- +- +- +- + + destroy + restart +Index: virt-manager-1.2.1/virtinst/guest.py +=================================================================== +--- virt-manager-1.2.1.orig/virtinst/guest.py ++++ virt-manager-1.2.1/virtinst/guest.py +@@ -847,6 +847,7 @@ class Guest(XMLBuilder): + self.features.pae = self.conn.caps.supports_pae() + + if (self.features.vmport == "default" and ++ self.os.is_x86() and + self.has_spice() and + self.conn.check_support(self.conn.SUPPORT_CONN_VMPORT)): + self.features.vmport = False diff --git a/virt-manager.changes b/virt-manager.changes index 2565a774..6b5429f5 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 3 10:43:15 MDT 2015 - carnold@suse.com + +- bsc#944374 - virt-manager uninstallable on aarch64 + virt-manager.spec +- Add upstream bug fix + 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch + ------------------------------------------------------------------- Mon Aug 31 16:41:28 MDT 2015 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 0c9aec7e..d29943ef 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu" @@ -45,6 +46,7 @@ Patch6: f81358b0-dont-display-error-if-machine-is-missing-in-XML.patch Patch7: aebebbf8-report-an-error-for-pxe-install-without-network.patch Patch8: 4970615f-fix-qemu-vs-lxc-detection.patch Patch9: eb92178e-virtinst-fix-storage-pool-lookup.patch +Patch10: 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -95,7 +97,7 @@ Requires: dconf Requires: gtk3 Requires: python-gconf Requires: virt-manager-common = %{verrel} -Requires: vm-install >= 0.5.6 +Recommends: vm-install >= 0.5.6 # Typelib's Recommends: typelib(AppIndicator3) @@ -179,6 +181,7 @@ machine). %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 diff --git a/virtman-add-s390x-arch-support.patch b/virtman-add-s390x-arch-support.patch index bf83c311..ae06bfa9 100644 --- a/virtman-add-s390x-arch-support.patch +++ b/virtman-add-s390x-arch-support.patch @@ -75,7 +75,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py return self.add_device(VirtualGraphics(self.conn)) -@@ -956,7 +961,7 @@ class Guest(XMLBuilder): +@@ -957,7 +962,7 @@ class Guest(XMLBuilder): if self._hv_only_supports_virtio(): return True From 88ae24de3a0663d0baebdb51d8e1925ac2295971 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Fri, 4 Sep 2015 20:50:43 +0000 Subject: [PATCH 5/7] - Drop virtinst-detect-windows-media.patch as this is not needed now that we use libosinfo OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=255 --- virt-manager.changes | 2 + virt-manager.spec | 8 +-- virtinst-detect-windows-media.patch | 95 ----------------------------- 3 files changed, 5 insertions(+), 100 deletions(-) delete mode 100644 virtinst-detect-windows-media.patch diff --git a/virt-manager.changes b/virt-manager.changes index 6b5429f5..ff350e4f 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -5,6 +5,8 @@ Thu Sep 3 10:43:15 MDT 2015 - carnold@suse.com virt-manager.spec - Add upstream bug fix 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch +- Drop virtinst-detect-windows-media.patch as this is not needed + now that we use libosinfo ------------------------------------------------------------------- Mon Aug 31 16:41:28 MDT 2015 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index d29943ef..27826899 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -72,10 +72,9 @@ Patch121: virtinst-default-xen-to-qcow2-format.patch Patch123: virtinst-detect-oes-distros.patch Patch124: virtinst-modify-gui-defaults.patch Patch125: virtinst-vol-default-nocow.patch -Patch126: virtinst-detect-windows-media.patch -Patch127: virtinst-set-cache-mode-unsafe-for-install.patch -Patch128: virtinst-add-default-rng-device.patch -Patch129: virtinst-set-qemu-emulator.patch +Patch126: virtinst-set-cache-mode-unsafe-for-install.patch +Patch127: virtinst-add-default-rng-device.patch +Patch128: virtinst-set-qemu-emulator.patch # Bug Fixes Patch150: virtman-supported-disk-formats.patch Patch151: virtman-prevent-double-click-starting-vm-twice.patch @@ -210,7 +209,6 @@ machine). %patch126 -p1 %patch127 -p1 %patch128 -p1 -%patch129 -p1 # Bug Fixes %patch150 -p1 %patch151 -p1 diff --git a/virtinst-detect-windows-media.patch b/virtinst-detect-windows-media.patch deleted file mode 100644 index 9a9af51c..00000000 --- a/virtinst-detect-windows-media.patch +++ /dev/null @@ -1,95 +0,0 @@ -Enhancement to detect windows media. It is based solely upon -finding an autorun.inf file in the root of the installation source. -It only assumes windows, not the specific version of windows. -Index: virt-manager-1.2.1/virtinst/urlfetcher.py -=================================================================== ---- virt-manager-1.2.1.orig/virtinst/urlfetcher.py -+++ virt-manager-1.2.1/virtinst/urlfetcher.py -@@ -408,6 +408,24 @@ def _distroFromSUSEContent(fetcher, arch - return ob - - -+def _distroFromAutorun(fetcher, arch, vmtype=None): -+ # Just look for autorun.inf (also in uppercase) -+ # If present media is likely from a windows iso. -+ distro_version = None -+ if not fetcher.hasFile("autorun.inf"): -+ return None -+ -+ dclass = WindowsDistro -+ -+ ob = dclass(fetcher, arch, vmtype) -+ if dclass != GenericDistro: -+ ob.content = distro_version -+ -+ # Explictly call this, so we populate os_type/variant info -+ ob.isValidStore() -+ -+ return ob -+ - def getDistroStore(guest, fetcher): - stores = [] - logging.debug("Finding distro store for location=%s", fetcher.location) -@@ -427,6 +445,10 @@ def getDistroStore(guest, fetcher): - if dist: - return dist - -+ dist = _distroFromAutorun(fetcher, arch, _type) -+ if dist: -+ return dist -+ - stores = _allstores[:] - - # If user manually specified an os_distro, bump it's URL class -@@ -1175,6 +1197,13 @@ class ALTLinuxDistro(Distro): - logging.debug("Regex didn't match, not a %s distro", self.name) - return False - -+class WindowsDistro(Distro): -+ -+ urldistro = "windows" -+ os_variant = "win2k12r2" -+ -+ def isValidStore(self): -+ return False - - # Build list of all *Distro classes - def _build_distro_list(): -Index: virt-manager-1.2.1/virtinst/distroinstaller.py -=================================================================== ---- virt-manager-1.2.1.orig/virtinst/distroinstaller.py -+++ virt-manager-1.2.1/virtinst/distroinstaller.py -@@ -499,21 +499,25 @@ class DistroInstaller(Installer): - - def detect_distro(self, guest): - distro = None -+ def _get_distro(guest): -+ try: -+ fetcher = self._get_fetcher(guest, None) -+ fetcher.prepareLocation() -+ -+ store = self._get_store(guest, fetcher) -+ return store.get_osdict_info() -+ finally: -+ fetcher.cleanupLocation() - try: - if _is_url(self.conn, self.location): -- try: -- fetcher = self._get_fetcher(guest, None) -- fetcher.prepareLocation() -- -- store = self._get_store(guest, fetcher) -- distro = store.get_osdict_info() -- finally: -- fetcher.cleanupLocation() -+ distro = _get_distro(guest) - elif self.conn.is_remote(): - logging.debug("Can't detect distro for media on " - "remote connection.") - else: - distro = OSDB.lookup_os_by_media(self.location) -+ if distro is None: -+ distro = _get_distro(guest) - except: - logging.debug("Error attempting to detect distro.", exc_info=True) - From d550efe6c53dd5e83a7ecf18db5743e40fa68067 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 8 Sep 2015 21:00:39 +0000 Subject: [PATCH 6/7] Fix spec file to correctly build Tumbleweed, Leap, and sle12sp1 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=256 --- virt-manager.spec | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/virt-manager.spec b/virt-manager.spec index 27826899..9d938fe1 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu" @@ -95,31 +94,18 @@ Requires: dbus-1-x11 Requires: dconf Requires: gtk3 Requires: python-gconf -Requires: virt-manager-common = %{verrel} -Recommends: vm-install >= 0.5.6 - -# Typelib's -Recommends: typelib(AppIndicator3) -Requires: typelib(GVnc) -Requires: typelib(GtkVnc) -Requires: typelib(LibvirtGLib) -Requires: typelib(SpiceClientGtk) -Requires: typelib(Vte) - # For console widget Requires: python-gobject-cairo Recommends: python-SpiceClientGtk - Requires: virt-install +Requires: virt-manager-common = %{verrel} +Recommends: vm-install >= 0.5.6 %if %{with_guestfs} Requires: python-libguestfs %endif BuildRequires: glib2-devel -%if 0%{?suse_version} > 1315 -BuildRequires: gobject-introspection -%endif BuildRequires: intltool BuildRequires: perl BuildRequires: python @@ -143,7 +129,17 @@ Requires: libvirt-python >= 0.7.0 Requires: python-ipaddr Requires: python-libxml2 Requires: python-urlgrabber +%if 0%{?is_opensuse} +BuildRequires: gobject-introspection +%else +Recommends: typelib(AppIndicator3) +Requires: typelib(GVnc) +Requires: typelib(GtkVnc) Requires: typelib(Libosinfo) +Requires: typelib(LibvirtGLib) +Requires: typelib(SpiceClientGtk) +Requires: typelib(Vte) +%endif %description common Common files used by the different virt-manager interfaces, as well as From f6b963a1ce44bf5e97a892b8222a082f937a8717 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 8 Sep 2015 21:55:12 +0000 Subject: [PATCH 7/7] - bsc#942796 - Virtualization/virt-manager: Missing dependeny virt-manager.spec OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=257 --- virt-manager.changes | 6 ++++++ virt-manager.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/virt-manager.changes b/virt-manager.changes index ff350e4f..3ae86d01 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 8 15:59:53 MDT 2015 - carnold@suse.com + +- bsc#942796 - Virtualization/virt-manager: Missing dependeny + virt-manager.spec + ------------------------------------------------------------------- Thu Sep 3 10:43:15 MDT 2015 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 9d938fe1..465b192d 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu"