Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit libguestfs for openSUSE:Factory
Hello community,

here is the log from the commit of package libguestfs for openSUSE:Factory
checked in at 2019-04-09 20:19:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libguestfs (Old)
and /work/SRC/openSUSE:Factory/.libguestfs.new.3908 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libguestfs"

Tue Apr 9 20:19:07 2019 rev:64 rq:692565 version:1.38.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/libguestfs/libguestfs.changes 2018-06-19
11:58:04.674475368 +0200
+++ /work/SRC/openSUSE:Factory/.libguestfs.new.3908/libguestfs.changes
2019-04-09 20:19:09.909881624 +0200
@@ -1,0 +2,8 @@
+Mon Apr 8 18:50:31 UTC 2019 - Larry Dewey <ldewey@xxxxxxxx>
+
+- Fixing issue with virt-customize uninstall and '-l'
+ (bnc#1131342)
+ Patches added:
+ fd43730e-error-with-uninstall-option-on-SUSE.patch
+
+-------------------------------------------------------------------

New:
----
fd43730e-error-with-uninstall-option-on-SUSE.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libguestfs.spec ++++++
--- /var/tmp/diff_new_pack.ZN6xVP/_old 2019-04-09 20:19:11.093883238 +0200
+++ /var/tmp/diff_new_pack.ZN6xVP/_new 2019-04-09 20:19:11.097883243 +0200
@@ -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 <mhrusecky@xxxxxxxxxx>
#
# 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 @@
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
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 @@

%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 @@

%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 @@
%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 @@

%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 @@
%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 @@
%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 @@
%{?!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 @@

%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 @@
%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 @@

%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 @@
%ifarch %ix86 x86_64
BuildRequires: syslinux
%endif
+BuildRequires: ldmtool
BuildRequires: systemd
BuildRequires: systemd-sysvinit
BuildRequires: tar
@@ -415,7 +417,6 @@
BuildRequires: util-linux-lang
BuildRequires: xfsprogs
BuildRequires: xz
-BuildRequires: ldmtool

# Needed by guestfsd which is burried in the appliance
#
@@ -458,7 +459,7 @@
%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 @@
%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 @@

%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 @@

%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 @@

%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
@@ -543,7 +544,7 @@
%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 @@
%setup -q -a 789653
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%patch50 -p1
%patch51 -p1
%patch52 -p1

++++++ fd43730e-error-with-uninstall-option-on-SUSE.patch ++++++
From a4f65bf89d955f585f141fd3402e51eec53ba562 Mon Sep 17 00:00:00 2001
From: Sebastian Meyer <meyer@xxxxxxxxxxxxx>
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 <ldewey@xxxxxxxx>
---
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


< Previous Next >
This Thread