From cc3b735205a52b619c0bcf990898541d9bc3783ed9bdf5baa29d406f0c1ec797 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 21 Jul 2020 19:01:32 +0000 Subject: [PATCH] - 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 --- fix-redefinition-error.patch | 50 ----------------------------------- libguestfs.keyring | Bin 2823 -> 0 bytes virt-v2v-1.42.0.tar.gz | 3 --- virt-v2v-1.43.1.tar.gz | 3 +++ virt-v2v.changes | 7 +++++ virt-v2v.spec | 5 +--- 6 files changed, 11 insertions(+), 57 deletions(-) delete mode 100644 fix-redefinition-error.patch delete mode 100644 libguestfs.keyring delete mode 100644 virt-v2v-1.42.0.tar.gz create mode 100644 virt-v2v-1.43.1.tar.gz diff --git a/fix-redefinition-error.patch b/fix-redefinition-error.patch deleted file mode 100644 index 2fd66fb..0000000 --- a/fix-redefinition-error.patch +++ /dev/null @@ -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; diff --git a/libguestfs.keyring b/libguestfs.keyring deleted file mode 100644 index fc15a241c7f4d90d6eb0075e0628fec19a29608a07e1498a163819af0d0e729c..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2823 zcma*oXEYm(0><$qB7$nPViakqqNG)u+FR_sQdc{DRukabMCqKo^wCkug~Y-bN=ZdDzIiUZ#$40(0^!V6(C-KH79?s=m3cGghyAo z1|dJMm+eiM>Vb)QYy4I#;Xu&Z^B~&YVZ!Whl6YA`T0fY9jOhHw z+Y;*35;Jx(8F=n(3o5j*bNOr3S) zCOp0NiMsuh^>)x<=&*u##pa25u9;{ZZc=y@%)4CE$a$A}A*UQGOC-D04;}dULUfuV z)^qc0R62lhwbK5pAcC9hk{LK2KJQ&jd|seog-6NxEVm_4X)8y7DYjWwHK2eI$lRku zmeq4z0zkjTs4a++z4bu{k^$N0>0MkG^k~>}tQQd>eap=1)cK}mGM_yYhtaPw3u{n! zU9d7X%GZbXT!~-iaePA-_ZF&Sz{>(|!tON<`4C)es{n-Uesd{GoD$><>+YS*e%6$X zv}81ZQEu&BDa*m|%?xc}K? ztXy1dUpQFtxVqa*MT11aG(ZsGE-C15Js>6$2qig`j06Osg@VW_D8Y0f5+LX{5JVpY zpdhDC^oaLZsK??x8DJOWJSw`FnKV|{5~fVJ%k`yWLJxgLVDcRdn^Wa_F@huK2}*V{VwcRgyv*)4g2Qgt1JGlabiOx*7Fj?B<+5~s41Ba znTns*;eGgN*mTv0;L>wfxeCI*{K-s;9kSV!?`oEYYHR#>`F5iO`ZuDJL%yslOO9&w zhbbHM^ngdugCnWhKqq{uTHT9qS(fk}s?L44SS*-LzWFNMdJ_cZV+Pj}Fc0 z$z?*yD| z^ee!4Z%nhXNm_MKw>GfR!|#AT7wI=d8;#FBd0Dn`;z*2sFEnNL=50xc+d7>-sr4hc z1H^ZFsD|Tz3VZsuG#PhW4A#n%$Hvw9zllAj{C|nDDp3Q9IoOo59u_f15UB-d(i^Ft zm}W~GSou3Y2Zae}aUVFWKJ)XZ-FcZ)f7}5VNSmEBezlPwny+1V!c|G1q2)yJu^>SU zBG(uFdMTFhV(LalnV(s$P>l{I_IXET&d9&(TxDa{R*NCzcuMf&q78elSLN9YIaoM7X!j3`9@_C^pJ@OJh;qD77 z`}&Nz_D*Iq6f;t7?Bqxowet8!npZ$`6NXiVD@~AY_g*>B){{F>D1? zN$g|68|pA_wcr~kt)JAUlnukx>iU8KA)f_4{X1&=@-!^E^P8QCNsCiKiUK_F>Xsli+q$Z*{a2b32CMwb3D{%D_`*E!rm9<3xmVE)l89dYVw5nlryxm zap55S(@vrBI7zH^ydCt_O(Ugr9>qJgQm;i{)`fD?)7n|Jj)=c?=qu9x3%|TVwl?!x z?-#a4>J7h7(TrYP9;;VFFnL~q)11l=W{2zM0PM_#^G-;w9~Y(6gf0(xy$5NJB{8G) z2_PZQC}tF@|I|RCJ_Ct6H6l-=E50j$d5Ku9&`{QVe8Z;T+VX2372^TDbVX-o_tL$y zfM36H?e10e)+AoUd;Ar?$c*rS7DBr*maRLN9n|78-|^BE1bP6RW%uVWO+Eh#-^#2q zU1o2OGeEnJe`vc1&bKa=PK5K>MrUoy*4Di*xQ~Hr8YK=ae$S@5;A6m-C*^N>H6QiE z+Z~%eGDDNK_vktjC^nxMUEXZReG3G^_uml$%lONCD~B)o&u@Ar}fQG5;T#E%^U88SI<&z@~yy|THGE%E1PbI z?F^r&ZTiw{?xi@{*DAy6C4z2C)^HACOJ!QTq)OKNiy$F_ao^+$ziBa!`o*phmK_>s za)NY_nGb%M+@h1zb zdfh2x>9W=SlC19X_yB5T8jPIITr(IuajP65y|~iU>niq=mN|NI*0)B&ixQw`dlhcIFP)G9WnV`}K3C{4m}cRO<&1vJ^K5DAVUo*Z<@ zunwMvxU0NO;ORRnw0-LRLg3}q^7?BlO`eOGFQ3pD@ diff --git a/virt-v2v-1.42.0.tar.gz b/virt-v2v-1.42.0.tar.gz deleted file mode 100644 index 96794e8..0000000 --- a/virt-v2v-1.42.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a177452d990be506e66a7fd986d8a7b727d48158bb564673babe34f94a857547 -size 7250373 diff --git a/virt-v2v-1.43.1.tar.gz b/virt-v2v-1.43.1.tar.gz new file mode 100644 index 0000000..0d7ee6d --- /dev/null +++ b/virt-v2v-1.43.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa78a48b2bd8950b376520e1f95660790002bc8c20efef134b6a0ff50ba34721 +size 7251291 diff --git a/virt-v2v.changes b/virt-v2v.changes index 94f6bd8..f441b63 100644 --- a/virt-v2v.changes +++ b/virt-v2v.changes @@ -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 diff --git a/virt-v2v.spec b/virt-v2v.spec index b646da3..9521df2 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -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