- Update to version 1.43.1

- Drop
  31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch
  7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=459

0002-common-extract-UTF-8-conversion-function.patch

@@ -13,10 +13,10 @@ guestfs-utils.h as guestfs_int_string_to_utf8()
  common/utils/utils.c         | 64 ++++++++++++++++++++++++++++++++++++++++
  3 files changed, 76 insertions(+), 68 deletions(-)
 
-Index: libguestfs-1.42.0/common/utils/guestfs-utils.h
+Index: libguestfs-1.43.1/common/utils/guestfs-utils.h
 ===================================================================
---- libguestfs-1.42.0.orig/common/utils/guestfs-utils.h
+--- libguestfs-1.43.1.orig/common/utils/guestfs-utils.h
-+++ libguestfs-1.42.0/common/utils/guestfs-utils.h
++++ libguestfs-1.43.1/common/utils/guestfs-utils.h
 @@ -33,6 +33,7 @@
  #define GUESTFS_UTILS_H_
  
@@ -43,10 +43,10 @@ Index: libguestfs-1.42.0/common/utils/guestfs-utils.h
  /* Not all language bindings know how to deal with Pointer arguments.
   * Those that don't will use this macro which complains noisily and
   * returns NULL.
-Index: libguestfs-1.42.0/common/utils/libxml2-utils.c
+Index: libguestfs-1.43.1/common/utils/libxml2-utils.c
 ===================================================================
---- libguestfs-1.42.0.orig/common/utils/libxml2-utils.c
+--- libguestfs-1.43.1.orig/common/utils/libxml2-utils.c
-+++ libguestfs-1.42.0/common/utils/libxml2-utils.c
++++ libguestfs-1.43.1/common/utils/libxml2-utils.c
 @@ -30,8 +30,6 @@
  #include <string.h>
  #include <errno.h>
@@ -141,10 +141,10 @@ Index: libguestfs-1.42.0/common/utils/libxml2-utils.c
 -
 -  return out;
 -}
-Index: libguestfs-1.42.0/common/utils/utils.c
+Index: libguestfs-1.43.1/common/utils/utils.c
 ===================================================================
---- libguestfs-1.42.0.orig/common/utils/utils.c
+--- libguestfs-1.43.1.orig/common/utils/utils.c
-+++ libguestfs-1.42.0/common/utils/utils.c
++++ libguestfs-1.43.1/common/utils/utils.c
 @@ -35,6 +35,7 @@
  #include <sys/types.h>
  #include <sys/wait.h>
@@ -153,7 +153,7 @@ Index: libguestfs-1.42.0/common/utils/utils.c
  
  /* NB: MUST NOT require linking to gnulib, because that will break the
   * Python 'sdist' which includes a copy of this file.  It's OK to
-@@ -641,3 +642,66 @@ guestfs_int_hexdump (const void *data, s
+@@ -640,3 +641,66 @@ guestfs_int_hexdump (const void *data, s
      fprintf (fp, "|\n");
    }
  }

31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch

@@ -1,34 +0,0 @@
-Subject: po: Remove virt-v2v related dependency from POTFILES-ml.
-From: Richard W.M. Jones rjones@redhat.com Mon Mar 9 17:31:55 2020 +0000
-Date: Mon Mar 9 17:31:55 2020 +0000:
-Git: 31e6b187100626cae44bcb505db153088245155c
-
-Causes this error if you compile libguestfs 1.42.0 from the tarball
-without invoking the generator:
-
-make[4]: *** No rule to make target '../common/mlv2v/uefi.ml', needed by 'libguestfs.pot'.  Stop.
-
-diff --git a/Makefile.am b/Makefile.am
-index 27f2c6eed..2f0446d60 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -345,6 +345,7 @@ po/POTFILES-ml: configure.ac
- 	cd $(srcdir); \
- 	find builder common/ml* customize dib get-kernel resize sparsify sysprep -name '*.ml' | \
- 	grep -v '^builder/templates/' | \
-+	grep -v '^common/mlv2v/' | \
- 	grep -v -E '.*_tests\.ml$$' | \
- 	LC_ALL=C sort > $@-t
- 	mv $@-t $@
-diff --git a/po/POTFILES-ml b/po/POTFILES-ml
-index a9b6efdaa..2fbdff03d 100644
---- a/po/POTFILES-ml
-+++ b/po/POTFILES-ml
-@@ -41,7 +41,6 @@ common/mltools/urandom.ml
- common/mltools/xpath_helpers.ml
- common/mlutils/c_utils.ml
- common/mlutils/unix_utils.ml
--common/mlv2v/uefi.ml
- common/mlvisit/visit.ml
- common/mlxml/xml.ml
- customize/append_line.ml

7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch

@@ -1,19 +0,0 @@
-Subject: lib: remove extra @LIBS@ from pkg-config file
-From: Pino Toscano ptoscano@redhat.com Wed Mar 11 13:19:31 2020 +0100
-Date: Thu Mar 12 11:45:30 2020 +0100:
-Git: 7265f08ce99e592a63a9470afad2da95167a800c
-
-At the moment it is empty, so probably it does not exist. Remove it to
-avoid adding spurious content to the pkg-config file in case that
-variable will get a value in the future.
-
-diff --git a/lib/libguestfs.pc.in b/lib/libguestfs.pc.in
-index 679ed7eba..013bf0f28 100644
---- a/lib/libguestfs.pc.in
-+++ b/lib/libguestfs.pc.in
-@@ -8,4 +8,4 @@ Version: @VERSION@
- Description: libguestfs library for accessing and modifying VM images
- Requires:
- Cflags:
--Libs: -lguestfs @LIBS@
-+Libs: -lguestfs

libguestfs-1.42.0.tar.gz

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

libguestfs-1.43.1.tar.gz

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

libguestfs.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul 20 17:16:28 MDT 2020 - carnold@suse.com
+
+- Update to version 1.43.1
+- Drop
+  31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch
+  7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch
+
 -------------------------------------------------------------------
 Tue Jul  7 15:48:08 MDT 2020 - carnold@suse.com
 

libguestfs.spec

@@ -18,7 +18,7 @@
 # needsbinariesforbuild
 
 
-Version:        1.42.0
+Version:        1.43.1
 Release:        0
 %{ocaml_preserve_bytecode}
 
@@ -102,6 +102,7 @@ BuildRequires:  dhcp-client
 BuildRequires:  libjansson-devel
 BuildRequires:  pcre-devel
 BuildRequires:  pkg-config
+BuildRequires:  python3-devel
 BuildRequires:  qemu-tools
 BuildRequires:  readline-devel
 BuildRequires:  supermin >= 5.1.6
@@ -143,8 +144,6 @@ Summary:        Compatibility package for guestfs-tools
 # Upstream patches
 License:        GPL-2.0-only
 Group:          System/Filesystems
-Patch1:         31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch
-Patch2:         7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch
 
 # Pending upstram review
 Patch50:        0001-Introduce-a-wrapper-around-xmlParseURI.patch
@@ -304,25 +303,7 @@ Allows lua scripts to directly use libguestfs.
 #
 
 %if %{with python_bindings}
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%{?!python_module:%define python_module() python3-%{**}}
-%package -n python2-libguestfs
-Summary:        Python 2 bindings for libguestfs
-License:        GPL-2.0-only
-Group:          Development/Languages/Python
-BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module setuptools}
-BuildRequires:  python
-BuildRequires:  python-devel
-BuildRequires:  python-rpm-macros
-%define _configure_python --enable-python
-#
-Obsoletes:      libguestfs-python < %{version}
-Obsoletes:      python-libguestfs < %{version}
-Provides:       python-libguestfs = %{version}
-
-%description -n python2-libguestfs
-Allows Python 2 scripts to directly use libguestfs.
-
 %package -n python3-libguestfs
 Summary:        Python 3 bindings for libguestfs
 License:        GPL-2.0-only
@@ -560,8 +541,7 @@ It can import a variety of guest operating systems from libvirt-managed hosts.
 %prep
 : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
 %setup -q -a 789653
-%patch1 -p1
+#%setup -q -a 1 -a 2 -a 789653
-%patch2 -p1
 %patch50 -p1
 %patch51 -p1
 %patch52 -p1
@@ -663,12 +643,6 @@ mv t %{name}.files
 pushd python
 sed -i -e "s:libraries=:library_dirs=['%{buildroot}/%{_libdir}'], libraries=:" setup.py
 make stamp-extra-files
-# Build needs libguestfs library to be installed
-
-# HACKY! Change config.h for python2
-echo '#define HAVE_PYSTRING_ASSTRING 1' >> config.h
-%python2_build
-%python2_install
 
 # HACKY! Change config.h for python3
 sed 's/\(#define HAVE_PYSTRING_ASSTRING 1\)/\/* \1 *\//' -i config.h
@@ -797,9 +771,6 @@ rm %{buildroot}/%{_datadir}/virt-p2v/p2v.ks.in
 %endif
 #
 %if %{with python_bindings}
-%files -n python2-libguestfs
-%defattr(-,root,root)
-%{python2_sitearch}/*
 
 %files -n python3-libguestfs
 %defattr(-,root,root)