From 48bb17705f1ebc0170f6f2f63393854e600fa312 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 2 Sep 2019 22:26:20 +0100
Subject: [PATCH] New upstream version 1.41.4.

---
 ...BS-is-not-set-in-Python-3.8-RHBZ-170.patch | 54 -------------------
 libguestfs.spec                               | 10 ++--
 sources                                       |  3 +-
 3 files changed, 6 insertions(+), 61 deletions(-)
 delete mode 100644 0001-python-PYTHON_LIBS-is-not-set-in-Python-3.8-RHBZ-170.patch

diff --git a/0001-python-PYTHON_LIBS-is-not-set-in-Python-3.8-RHBZ-170.patch b/0001-python-PYTHON_LIBS-is-not-set-in-Python-3.8-RHBZ-170.patch
deleted file mode 100644
index 0d065e5..0000000
--- a/0001-python-PYTHON_LIBS-is-not-set-in-Python-3.8-RHBZ-170.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c4638739d684609471cfa94c08e7b90c70ea3e83 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 31 May 2019 13:07:25 +0100
-Subject: [PATCH] python: PYTHON_LIBS is not set in Python 3.8 (RHBZ#1705482).
-
-Python 3.8 no longer links C extensions to -lpython, instead relying
-on the fact that the python binary itself already contains those
-symbols.  This means $PYTHON_LIBS is empty and so the Python bindings
-are not built.
-
-Use a different test to see if the python module is available.
----
- m4/guestfs-python.m4 | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/m4/guestfs-python.m4 b/m4/guestfs-python.m4
-index 7d4c991bb..befa9b102 100644
---- a/m4/guestfs-python.m4
-+++ b/m4/guestfs-python.m4
-@@ -33,14 +33,17 @@ AS_IF([test "x$enable_python" != "xno"],[
-         PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
-         PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
- 	AC_MSG_RESULT([$PYTHON_VERSION])
-+
-         # Debian: python-2.7.pc, python-3.2.pc
-         PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[
-+            have_python_module=1
-             AC_SUBST([PYTHON_CFLAGS])
-             AC_SUBST([PYTHON_LIBS])
-             AC_SUBST([PYTHON_VERSION])
-             AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
-         ],[
-             PKG_CHECK_MODULES([PYTHON], [python],[
-+                have_python_module=1
-                 AC_SUBST([PYTHON_CFLAGS])
-                 AC_SUBST([PYTHON_LIBS])
-                 AC_SUBST([PYTHON_VERSION])
-@@ -49,6 +52,7 @@ AS_IF([test "x$enable_python" != "xno"],[
-                 AC_MSG_WARN([python $PYTHON_VERSION not found])
-             ])
-         ])
-+
-         AC_MSG_CHECKING([Python prefix])
-         PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
-         AC_MSG_RESULT([$PYTHON_PREFIX])
-@@ -101,4 +105,4 @@ AS_IF([test "x$enable_python" != "xno"],[
-     AC_SUBST(PYTHON_EXT_SUFFIX)
- ])
- AM_CONDITIONAL([HAVE_PYTHON],
--    [test "x$PYTHON" != "xno" && test "x$PYTHON_LIBS" != "x" ])
-+    [test "x$PYTHON" != "xno" && test "x$have_python_module" = "x1" ])
--- 
-2.21.0
-
diff --git a/libguestfs.spec b/libguestfs.spec
index 091c423..b312096 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -41,8 +41,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.40.2
-Release:       10%{?dist}
+Version:       1.41.4
+Release:       1%{?dist}
 License:       LGPLv2+
 
 # No kernel https://fedoraproject.org/wiki/Changes/Stop_Building_i686_Kernels
@@ -69,9 +69,6 @@ Source6:       yum.conf.in
 Source7:       libguestfs.keyring
 %endif
 
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1705482
-Patch0001:     0001-python-PYTHON_LIBS-is-not-set-in-Python-3.8-RHBZ-170.patch
-
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool, gettext-devel
 %endif
@@ -1315,6 +1312,9 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
 
 
 %changelog
+* Mon Sep 02 2019 Richard W.M. Jones <rjones@redhat.com> - 1:1.41.4-1
+- New upstream version 1.41.4.
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1:1.40.2-10
 - Rebuilt for Python 3.8
 
diff --git a/sources b/sources
index 2a8eaf5..4d30489 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (libguestfs-1.40.2.tar.gz) = d288f15d5a70b4b87a4271ea2eb7dc0ec4f48fdb136b8f62003352a069f75573de873e1063763889f410fb1b99951252e9a48dd73bf0233047f21aae43ac6de2
-SHA512 (libguestfs-1.40.2.tar.gz.sig) = 7e7db806c7051010367a82c89fb4ac6af2824c28f54cc7df561010ad6a87562fb3c2d4e3bfc14f7cc7308344b1dfb8532f88969ac59cfd17745717dc305c81b9
+SHA512 (libguestfs-1.41.4.tar.gz) = 14486037ddb171113520f97fce152af3b1af9b3a85f2a864d7a74db60239ee8da058020abfebd2353a94e21a4c7b9eb8f1d3518f0714280c3f558a88bcd44342