- Update to version 1.43.1

* Several bug fixes
- Drop fix-redefinition-error.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-v2v?expand=0&rev=2
This commit is contained in:
Charles Arnold 2020-07-21 19:01:32 +00:00 committed by Git OBS Bridge
parent 4df516b9b8
commit cc3b735205
6 changed files with 11 additions and 57 deletions

View File

@ -1,50 +0,0 @@
Fixes:
[ 64s] In file included from /usr/lib64/glib-2.0/include/glibconfig.h:9,
[ 64s] from /usr/include/glib-2.0/glib/gtypes.h:32,
[ 64s] from /usr/include/glib-2.0/glib/galloca.h:32,
[ 64s] from /usr/include/glib-2.0/glib.h:30,
[ 64s] from /usr/include/glib-2.0/gobject/gbinding.h:28,
[ 64s] from /usr/include/glib-2.0/glib-object.h:22,
[ 64s] from /usr/include/libosinfo-1.0/osinfo/osinfo.h:28,
[ 64s] from libosinfo-c.c:25:
[ 64s] /usr/include/glib-2.0/glib/gmacros.h:1028:49: error: redefinition of 'glib_autoptr_clear_OsinfoList'
[ 64s] 1028 | #define _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName) glib_autoptr_clear_##TypeName
[ 64s] | ^~~~~~~~~~~~~~~~~~~
[ 64s] /usr/include/glib-2.0/glib/gmacros.h:1044:36: note: in expansion of macro '_GLIB_AUTOPTR_CLEAR_FUNC_NAME'
[ 64s] 1044 | static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName) (TypeName *_ptr) \
[ 64s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ 64s] /usr/include/glib-2.0/glib/gmacros.h:1061:3: note: in expansion of macro '_GLIB_DEFINE_AUTOPTR_CLEANUP_FUNCS'
[ 64s] 1061 | _GLIB_DEFINE_AUTOPTR_CLEANUP_FUNCS(TypeName, TypeName, func)
[ 64s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ 64s] libosinfo-c.c:47:1: note: in expansion of macro 'G_DEFINE_AUTOPTR_CLEANUP_FUNC'
[ 64s] 47 | G_DEFINE_AUTOPTR_CLEANUP_FUNC(OsinfoList, g_object_unref)
[ 64s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ 64s] /usr/include/glib-2.0/glib/gmacros.h:1028:49: note: previous definition of 'glib_autoptr_clear_OsinfoList' was here
[ 64s] 1028 | #define _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName) glib_autoptr_clear_##TypeName
[ 64s] | ^~~~~~~~~~~~~~~~~~~
[ 64s] /usr/include/glib-2.0/glib/gmacros.h:1044:36: note: in expansion of macro '_GLIB_AUTOPTR_CLEAR_FUNC_NAME'
[ 64s] 1044 | static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName) (TypeName *_ptr) \
[ 64s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ 64s] /usr/include/glib-2.0/glib/gmacros.h:1056:3: note: in expansion of macro '_GLIB_DEFINE_AUTOPTR_CLEANUP_FUNCS'
[ 64s] 1056 | _GLIB_DEFINE_AUTOPTR_CLEANUP_FUNCS(ModuleObjName, ParentName, _GLIB_AUTOPTR_CLEAR_FUNC_NAME(ParentName))
[ 64s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ 64s] /usr/include/glib-2.0/gobject/gtype.h:1500:3: note: in expansion of macro '_GLIB_DEFINE_AUTOPTR_CHAINUP'
[ 64s] 1500 | _GLIB_DEFINE_AUTOPTR_CHAINUP (ModuleObjName, ParentName) \
[ 64s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ 64s] /usr/include/libosinfo-1.0/osinfo/osinfo_list.h:33:1: note: in expansion of macro 'G_DECLARE_DERIVABLE_TYPE'
[ 64s] 33 | G_DECLARE_DERIVABLE_TYPE(OsinfoList, osinfo_list, OSINFO, LIST, GObject)
[ 64s] | ^~~~~~~~~~~~~~~~~~~~~~~~
Index: virt-v2v-1.42.0/v2v/libosinfo-c.c
===================================================================
--- virt-v2v-1.42.0.orig/v2v/libosinfo-c.c
+++ virt-v2v-1.42.0/v2v/libosinfo-c.c
@@ -44,7 +44,6 @@
G_DEFINE_AUTOPTR_CLEANUP_FUNC(OsinfoFilter, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(OsinfoLoader, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(OsinfoList, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(OsinfoOsList, g_object_unref)
typedef OsinfoDb *OsinfoDb_t;

Binary file not shown.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a177452d990be506e66a7fd986d8a7b727d48158bb564673babe34f94a857547
size 7250373

3
virt-v2v-1.43.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa78a48b2bd8950b376520e1f95660790002bc8c20efef134b6a0ff50ba34721
size 7251291

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 20 19:53:29 MDT 2020 - carnold@suse.com
- Update to version 1.43.1
* Several bug fixes
- Drop fix-redefinition-error.patch
-------------------------------------------------------------------
Tue May 5 14:48:39 MDT 2020 - carnold@suse.com

View File

@ -26,14 +26,13 @@
%global source_directory 1.42-stable
Name: virt-v2v
Version: 1.42.0
Version: 1.43.1
Release: 1%{?dist}
%bcond_without bash_completion
URL: https://github.com/libguestfs/virt-v2v
Summary: Convert a virtual machine to run on KVM
License: GPL-2.0+
Group: System/Management
Patch0: fix-redefinition-error.patch
Source0: http://download.libguestfs.org/virt-v2v/%{source_directory}/%{name}-%{version}.tar.gz
%if 0%{verify_tarball_signature}
@ -89,8 +88,6 @@ BuildRequires: ocaml-libvirt-devel
BuildRequires: ocaml-ounit-devel
#BuildRequires: nbdkit-python-plugin
%if 0%{verify_tarball_signature}
BuildRequires: gnupg2
%endif