Hello community, here is the log from the commit of package yast2-vm for openSUSE:Factory checked in at 2018-11-18 22:59:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old) and /work/SRC/openSUSE:Factory/.yast2-vm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-vm" Sun Nov 18 22:59:34 2018 rev:81 rq:648687 version:4.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes 2018-07-03 23:33:05.900516650 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2018-11-18 23:00:03.683676690 +0100 @@ -1,0 +2,14 @@ +Wed Oct 31 10:58:27 MDT 2018 - [email protected] + +- bsc#1109832 - libvirt-daemon-config-network not installed by yast + vm. Tumbleweed is now getting the '_tools' patterns for xen and + kvm that are already found on SLE. +- 4.0.3 + +------------------------------------------------------------------- +Mon Aug 20 13:29:15 CEST 2018 - [email protected] + +- Switched license in spec file from SPDX2 to SPDX3 format. +- Changed dir of COPYING file. + +------------------------------------------------------------------- Old: ---- yast2-vm-4.0.2.tar.bz2 New: ---- yast2-vm-4.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.kfzL0o/_old 2018-11-18 23:00:05.623674515 +0100 +++ /var/tmp/diff_new_pack.kfzL0o/_new 2018-11-18 23:00:05.631674506 +0100 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 4.0.2 +Version: 4.0.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,7 +38,7 @@ Requires: yast2-ruby-bindings >= 1.0.0 Summary: Configure Hypervisor and Tools for Xen and KVM -License: GPL-2.0 +License: GPL-2.0-only Group: System/YaST %description @@ -75,6 +75,6 @@ %{yast_desktopdir}/virtualization-config.desktop %endif %doc %{yast_docdir} -%doc %{yast_docdir}/COPYING +%license %{yast_docdir}/COPYING %changelog ++++++ yast2-vm-4.0.2.tar.bz2 -> yast2-vm-4.0.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-4.0.2/package/yast2-vm.changes new/yast2-vm-4.0.3/package/yast2-vm.changes --- old/yast2-vm-4.0.2/package/yast2-vm.changes 2018-07-02 18:05:08.000000000 +0200 +++ new/yast2-vm-4.0.3/package/yast2-vm.changes 2018-11-13 08:46:17.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Oct 31 10:58:27 MDT 2018 - [email protected] + +- bsc#1109832 - libvirt-daemon-config-network not installed by yast + vm. Tumbleweed is now getting the '_tools' patterns for xen and + kvm that are already found on SLE. +- 4.0.3 + +------------------------------------------------------------------- +Mon Aug 20 13:29:15 CEST 2018 - [email protected] + +- Switched license in spec file from SPDX2 to SPDX3 format. +- Changed dir of COPYING file. + +------------------------------------------------------------------- Thu Jun 28 09:37:54 CEST 2018 - [email protected] - Added additional searchkeys to desktop file (fate#321043). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-4.0.2/package/yast2-vm.spec new/yast2-vm-4.0.3/package/yast2-vm.spec --- old/yast2-vm-4.0.2/package/yast2-vm.spec 2018-07-02 18:05:08.000000000 +0200 +++ new/yast2-vm-4.0.3/package/yast2-vm.spec 2018-11-13 08:46:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 4.0.2 +Version: 4.0.3 Release: 0 Group: System/YaST @@ -29,7 +29,7 @@ Requires: yast2-bootloader >= 3.1.35 BuildRequires: yast2-devtools >= 3.1.10 Requires: yast2-network >= 3.1.108 -License: GPL-2.0 +License: GPL-2.0-only # OSRelease Requires: yast2 >= 3.0.4 @@ -73,4 +73,4 @@ %{yast_desktopdir}/virtualization-config.desktop %endif %doc %{yast_docdir} -%doc %{yast_docdir}/COPYING +%license %{yast_docdir}/COPYING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-4.0.2/src/modules/VirtConfig.rb new/yast2-vm-4.0.3/src/modules/VirtConfig.rb --- old/yast2-vm-4.0.2/src/modules/VirtConfig.rb 2018-07-02 18:05:08.000000000 +0200 +++ new/yast2-vm-4.0.3/src/modules/VirtConfig.rb 2018-11-13 08:46:17.000000000 +0100 @@ -35,6 +35,7 @@ Yast.import "UI" textdomain "vm" Yast.import "Arch" + Yast.import "Message" Yast.import "OSRelease" Yast.import "Package" Yast.import "Progress" @@ -318,35 +319,11 @@ end log.info "VirtConfig::ConfigureDom0: Checking for Installed Patterns and Packages" - if isOpenSuse - UI.ChangeWidget(Id(:xen_server), :Enabled, !Package.Installed("patterns-server-xen_server")) - if isTumbleweed - # On Tumbleweed there is not a 'tools' pattern for Xen. Check for a few minimal RPMs - if Package.Installed("xen-tools") && Package.Installed("xen-libs") && - Package.Installed("libvirt-daemon-xen") && Package.Installed("tigervnc") && - Package.Installed("virt-manager") - UI.ChangeWidget(Id(:xen_tools), :Enabled, false) - end - else - UI.ChangeWidget(Id(:kvm_server), :Enabled, !Package.Installed("patterns-server-xen_tools")) - end + UI.ChangeWidget(Id(:xen_server), :Enabled, !Package.Installed("patterns-server-xen_server")) + UI.ChangeWidget(Id(:xen_tools), :Enabled, !Package.Installed("patterns-server-xen_tools")) + UI.ChangeWidget(Id(:kvm_server), :Enabled, !Package.Installed("patterns-server-kvm_server")) + UI.ChangeWidget(Id(:kvm_tools), :Enabled, !Package.Installed("patterns-server-kvm_tools")) - UI.ChangeWidget(Id(:kvm_server), :Enabled, !Package.Installed("patterns-server-kvm_server")) - if isTumbleweed - # On Tumbleweed there is not a 'tools' pattern for KVM. Check for a few minimal RPMs - if Package.Installed("libvirt-daemon-qemu") && Package.Installed("virt-manager") && - Package.Installed("tigervnc") - UI.ChangeWidget(Id(:kvm_tools), :Enabled, false) - end - else - UI.ChangeWidget(Id(:kvm_tools), :Enabled, !Package.Installed("patterns-server-kvm_tools")) - end - elsif isSLES - UI.ChangeWidget(Id(:xen_server), :Enabled, !Package.Installed("patterns-server-xen_server")) - UI.ChangeWidget(Id(:xen_tools), :Enabled, !Package.Installed("patterns-server-xen_tools")) - UI.ChangeWidget(Id(:kvm_server), :Enabled, !Package.Installed("patterns-server-kvm_server")) - UI.ChangeWidget(Id(:kvm_tools), :Enabled, !Package.Installed("patterns-server-kvm_tools")) - end if Package.Installed("libvirt-daemon-lxc") && Package.Installed("libvirt-daemon-config-network") UI.ChangeWidget(Id(:lxc), :Enabled, false) end @@ -402,51 +379,24 @@ common_vm_packages = [] result = true - if isOpenSuse == true - if install_vm == true - common_vm_packages = ["libvirt-client", "vm-install", "virt-install"] - end - - packages = ["patterns-server-xen_server"] if install_xen_server - if isTumbleweed - packages = packages + ["xen-tools", "xen-libs", "libvirt-daemon-xen", "libvirt-daemon-config-network", "tigervnc", "virt-manager"] if install_xen_tools - else - packages = ["patterns-server-xen_tools"] if install_xen_tools - end - - packages = packages + ["patterns-server-kvm_server"] if install_kvm_server - if isTumbleweed - packages = packages + ["libvirt-daemon-qemu", "libvirt-daemon-config-network", "tigervnc", "virt-manager"] if install_kvm_tools - else - packages = ["patterns-server-kvm_tools"] if install_kvm_tools - end - packages = packages + ["libvirt-daemon-lxc", "libvirt-daemon-config-network"] if install_lxc - result = Package.DoInstall(common_vm_packages + packages) - if result == false - Report.Error(_("Package installation failed\n")) + if install_lxc + packages = ["libvirt-daemon-lxc", "libvirt-daemon-config-network"] + result = Package.DoInstall(packages) + unless result + Report.Error(Message.FailedToInstallPackages) return false end - else - if install_lxc - packages = ["libvirt-daemon-lxc", "libvirt-daemon-config-network"] - result = Package.DoInstall(packages) - if result == false - Report.Error(_("Package installation failed for lxc\n")) - return false - end - end - if isSLES - packages = packages + ["patterns-server-xen_server"] if install_xen_server - packages = packages + ["patterns-server-xen_tools"] if install_xen_tools - packages = packages + ["patterns-server-kvm_server"] if install_kvm_server - packages = packages + ["patterns-server-kvm_tools"] if install_kvm_tools - packages = installGUIComponents(packages) - result = Package.DoInstall(packages) - if result == false - Report.Error(_("Package installation failed for sles patterns\n")) - return false - end - end + end + + packages << "patterns-server-xen_server" if install_xen_server + packages << "patterns-server-xen_tools" if install_xen_tools + packages << "patterns-server-kvm_server" if install_kvm_server + packages << "patterns-server-kvm_tools" if install_kvm_tools + packages = installGUIComponents(packages) + result = Package.DoInstall(packages) + unless result + Report.Error(Message.FailedToInstallPackages) + return false end success = true
