diff --git a/fd43730e-error-with-uninstall-option-on-SUSE.patch b/fd43730e-error-with-uninstall-option-on-SUSE.patch new file mode 100644 index 0000000..c2ce1fb --- /dev/null +++ b/fd43730e-error-with-uninstall-option-on-SUSE.patch @@ -0,0 +1,31 @@ +From a4f65bf89d955f585f141fd3402e51eec53ba562 Mon Sep 17 00:00:00 2001 +From: Sebastian Meyer +Date: Thu, 23 Aug 2018 16:45:27 +0200 +Subject: [PATCH 1/1] Fix error with --uninstall option on SUSE + +The `-l` option for some `zypper` subcommands is short for +`--auto-agree-with-licenses` and not available on the `zypper rm` command. + +(cherry picked from commit fd43730e2bfff17a365ffcf768b6c8db3089b524) +[BSC#1131342] +Signed-off-by: Larry Dewey +--- + customize/customize_run.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/customize/customize_run.ml b/customize/customize_run.ml +index f92e9a199..3eacdaca0 100644 +--- a/customize/customize_run.ml ++++ b/customize/customize_run.ml +@@ -181,7 +181,7 @@ exec >>%s 2>&1 + | "urpmi" -> sprintf "urpme %s" quoted_args + | "xbps" -> sprintf "xbps-remove -Sy %s" quoted_args + | "yum" -> sprintf "yum -y remove %s" quoted_args +- | "zypper" -> sprintf "zypper -n rm -l %s" quoted_args ++ | "zypper" -> sprintf "zypper -n rm %s" quoted_args + + | "unknown" -> + error_unknown_package_manager (s_"--uninstall") +-- +2.21.0 + diff --git a/libguestfs.changes b/libguestfs.changes index 82c1b26..ba58c69 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 8 18:50:31 UTC 2019 - Larry Dewey + +- Fixing issue with virt-customize uninstall and '-l' + (bnc#1131342) + Patches added: + fd43730e-error-with-uninstall-option-on-SUSE.patch + ------------------------------------------------------------------- Mon Jun 11 13:39:04 UTC 2018 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index da59d4d..6b32e77 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -1,7 +1,7 @@ # # spec file for package libguestfs # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Michal Hrusecky # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # needsbinariesforbuild @@ -140,10 +140,11 @@ Url: http://libguestfs.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Compatibility package for guestfs-tools # Upstream patches -License: GPL-2.0 +License: GPL-2.0-only Group: System/Filesystems -Patch0: d0e5a819-python-Fix-missing-additional-backslashes.patch +Patch0: d0e5a819-python-Fix-missing-additional-backslashes.patch Patch1: 0a55098f-builder-repository-fix-compute_short_id-for-sles-X.0.patch +Patch2: fd43730e-error-with-uninstall-option-on-SUSE.patch # Pending upstram review Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch Patch51: 0002-common-extract-UTF-8-conversion-function.patch @@ -175,7 +176,7 @@ performing partial backups, cloning VMs, and much else besides. %package -n guestfs-tools Summary: Tools for accessing and modifying virtual machine disk images -License: GPL-2.0 +License: GPL-2.0-only Group: System/Filesystems Provides: %{name} = %{version} Obsoletes: %{name} < %{version} @@ -228,7 +229,7 @@ virtual machines. %package -n guestfsd Summary: Daemon for the libguestfs appliance -License: GPL-2.0 +License: GPL-2.0-only Group: System/Filesystems Conflicts: libaugeas0 < 1.0.0 @@ -242,7 +243,7 @@ This package is only required for building the appliance. %package -n ocaml-libguestfs Summary: OCaml bindings for libguestfs # -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Languages/OCaml %description -n ocaml-libguestfs @@ -250,7 +251,7 @@ Allows OCaml scripts to directly use libguestfs. %package -n ocaml-libguestfs-devel Summary: Development files for libguesfs OCaml bindings -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Languages/OCaml %description -n ocaml-libguestfs-devel @@ -260,7 +261,7 @@ Allows OCaml scripts to directly use libguestfs. %if %{with perl_bindings} %package -n perl-Sys-Guestfs Summary: Perl bindings for libguestfs -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Languages/Perl BuildRequires: perl BuildRequires: perl(Data::Dumper) @@ -288,7 +289,7 @@ Allows Perl scripts to directly use libguestfs. %if %{with lua_bindings} %package -n lua-libguestfs Summary: Lua bindings for libguestfs -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Languages/Lua BuildRequires: lua-devel %define _configure_lua --enable-lua @@ -303,7 +304,7 @@ Allows lua scripts to directly use libguestfs. %{?!python_module:%define python_module() python-%{**} python3-%{**}} %package -n python2-libguestfs Summary: Python 2 bindings for libguestfs -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Languages/Python BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} @@ -321,7 +322,7 @@ Allows Python 2 scripts to directly use libguestfs. %package -n python3-libguestfs Summary: Python 3 bindings for libguestfs -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Languages/Python BuildRequires: python3 BuildRequires: python3-devel @@ -338,11 +339,11 @@ Allows Python 3 scripts to directly use libguestfs. %if %{with ruby_bindings} %package -n rubygem-libguestfs Summary: Ruby bindings for libguestfs -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Languages/Ruby BuildRequires: ruby BuildRequires: ruby-devel -BuildRequires: rubygem-rake +BuildRequires: rubygem(rake) %define _configure_ruby --enable-ruby # @@ -352,7 +353,7 @@ Allows Ruby scripts to directly use libguestfs. %package test Summary: Testcases for libguestfs -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Tools/Other Requires: %{name} @@ -405,6 +406,7 @@ BuildRequires: strace %ifarch %ix86 x86_64 BuildRequires: syslinux %endif +BuildRequires: ldmtool BuildRequires: systemd BuildRequires: systemd-sysvinit BuildRequires: tar @@ -415,7 +417,6 @@ BuildRequires: util-linux BuildRequires: util-linux-lang BuildRequires: xfsprogs BuildRequires: xz -BuildRequires: ldmtool # Needed by guestfsd which is burried in the appliance # @@ -458,7 +459,7 @@ Recommends: guestfs-winsupport %endif Summary: Virtual machine needed for libguestfs -License: GPL-2.0 +License: GPL-2.0-only Group: System/Filesystems Provides: libguestfs-data = %{version} Obsoletes: libguestfs-data < %{version} @@ -470,7 +471,7 @@ This package provides such an image, an initrd and a kernel. %if ! 0%{?is_opensuse} %package -n guestfs-winsupport Summary: Windows guest support in libguestfs -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Filesystems Requires: libguestfs >= 1.32 BuildRequires: ntfs-3g @@ -484,7 +485,7 @@ Provides the needed pieces for libguestfs to handle Windows guests. %package devel Summary: Development files for libguestfs -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Libraries/C and C++ Requires: libguestfs0 = %{version} @@ -498,7 +499,7 @@ performing partial backups, cloning VMs, and much else besides. %package -n libguestfs0 Summary: Runtime library of libguestfs -License: LGPL-2.1 +License: LGPL-2.1-only Group: System/Libraries Requires: %{kvm_binary} Requires: db48-utils @@ -528,7 +529,7 @@ virtual machines. %package -n virt-v2v Summary: Convert a virtual machine to run on KVM -License: GPL-2.0 +License: GPL-2.0-only Group: System/Management Requires: libguestfs0 = %{version} Requires: qemu-block-ssh @@ -537,13 +538,13 @@ Conflicts: virt-v2v <= 0.9.1 %description -n virt-v2v virt-v2v is a tool for converting and importing virtual machines to -libvirt-managed KVM. It can import a variety of guest operating systems +libvirt-managed KVM. It can import a variety of guest operating systems from libvirt-managed hosts. %if %{with p2v} %package -n virt-p2v Summary: Convert a physical machine to run on KVM -License: GPL-2.0 +License: GPL-2.0-only Group: System/Management Requires: gawk Requires: virt-v2v = %{version} @@ -558,6 +559,7 @@ It can import a variety of guest operating systems from libvirt-managed hosts. %setup -q -a 789653 %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch50 -p1 %patch51 -p1 %patch52 -p1 @@ -609,7 +611,7 @@ fi %{_configure_ruby} \ --disable-rpath \ --disable-static \ - --with-distro=SUSE + --with-distro=SUSE #Workaround an autotools bug make -j1 -C builder index-parse.c # 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir instead of the site dir