Fix a changelog entry

Require libvirt >= 11.10.0, qemu >= 7.2.0 and passt.

0001-python-PYTHON_LIBS-is-not-set-in-Python-3.8-RHBZ-170.patch

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

README-replacement.in

@@ -8,8 +8,7 @@ list:
 
   http://www.redhat.com/mailman/listinfo/libguestfs
 
-This Fedora package comes with a lot of help and examples to get you
-started.
+This package comes with a lot of help and examples to get you started.
 
 The first place to start are the manual pages.  Type:
 
@@ -20,19 +19,19 @@ The first place to start are the manual pages.  Type:
   man virt-cat   # and other virt-* tools
 
 If you install the libguestfs-devel package, then in the
-/usr/share/doc/libguestfs-devel/ directory you will also
-find:
+/usr/share/doc/libguestfs-devel/ directory you will find other
+documentation including:
 
  - BUGS: list of open bugs in this version
 
- - ChangeLog: the detailed list of changes in this version
+ - ChangeLog.gz: the detailed list of changes in this version
 
- - ROADMAP: the roadmap for future versions
+ - HACKING: how to extend libguestfs
 
  - TODO: ideas for extending libguestfs
 
  - *.c: example C programs using the API
 
- - *.xml: example virt-inspector output
+ - *.xml.gz: example virt-inspector output (compressed)
 
- - *.rng: virt-inspector RelaxNG schema
+ - virt-inspector.rng: virt-inspector RelaxNG schema

bump-and-build.sh

@@ -1,10 +0,0 @@
-#!/bin/sh -
-
-set -e
-
-rpmdev-bumpspec -c "- Bump and rebuild." libguestfs.spec
-git diff ||:
-echo "Press ENTER to commit, push and rebuild."
-read line
-fedpkg commit -m "Bump and rebuild." -p
-fedpkg build

copy-patches.sh

@@ -0,0 +1,56 @@
+#!/bin/bash -
+
+set -e
+
+# Maintainer script to copy patches from the git repo to the current
+# directory.  It's normally only used downstream (ie. in RHEL).  Use
+# it like this:
+#   ./copy-patches.sh
+
+rhel_version=9.0.0
+
+# Check we're in the right directory.
+if [ ! -f libguestfs.spec ]; then
+    echo "$0: run this from the directory containing 'libguestfs.spec'"
+    exit 1
+fi
+
+git_checkout=$HOME/d/libguestfs-rhel-$rhel_version
+if [ ! -d $git_checkout ]; then
+    echo "$0: $git_checkout does not exist"
+    echo "This script is only for use by the maintainer when preparing a"
+    echo "libguestfs release on RHEL."
+    exit 1
+fi
+
+# Get the base version of libguestfs.
+version=`grep '^Version:' libguestfs.spec | awk '{print $2}'`
+tag="v$version"
+
+# Remove any existing patches.
+git rm -f [0-9]*.patch ||:
+rm -f [0-9]*.patch
+
+# Get the patches.
+(cd $git_checkout; rm -f [0-9]*.patch; git format-patch -N --submodule=diff $tag)
+mv $git_checkout/[0-9]*.patch .
+
+# Remove any not to be applied.
+rm -f *NOT-FOR-RPM*.patch
+
+# Add the patches.
+git add [0-9]*.patch
+
+# Print out the patch lines.
+echo
+echo "--- Copy the following text into libguestfs.spec file"
+echo
+
+echo "# Patches."
+for f in [0-9]*.patch; do
+    n=`echo $f | awk -F- '{print $1}'`
+    echo "Patch$n:     $f"
+done
+
+echo
+echo "--- End of text"

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: xen-ci.brew-build.tier1.functional}

rpminspect.yaml

@@ -0,0 +1,5 @@
+# Ignore copy-patches.sh.  It is an internal script we use to
+# manage the patches.
+upstream:
+  ignore:
+  - copy-patches.sh

sources

@@ -1,2 +1,2 @@
-SHA512 (libguestfs-1.40.2.tar.gz) = d288f15d5a70b4b87a4271ea2eb7dc0ec4f48fdb136b8f62003352a069f75573de873e1063763889f410fb1b99951252e9a48dd73bf0233047f21aae43ac6de2
-SHA512 (libguestfs-1.40.2.tar.gz.sig) = 7e7db806c7051010367a82c89fb4ac6af2824c28f54cc7df561010ad6a87562fb3c2d4e3bfc14f7cc7308344b1dfb8532f88969ac59cfd17745717dc305c81b9
+SHA512 (libguestfs-1.58.0.tar.gz) = 67abbd37fe64935ae5cca13dbe1860fe2eab9df492fd134eacbdc1831e6034c849855e76118ce0002d3ac83205122947582dbe47b66f12b94dcb51155881501a
+SHA512 (libguestfs-1.58.0.tar.gz.sig) = e07758ed3901f9ae95dace16cbb4de194dbbde788155efcde7982226785928d1805af6939f201d74770923ad55997f1d465f9594cb81bc2435c0ea882ce546d8

tests/run-libguestfs-test-tool.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -
+set -e
+set -x
+
+# This only makes sure that libguestfs isn't totally broken.
+
+# Fix libvirt.
+systemctl restart virtqemud virtsecretd virtstoraged virtnetworkd
+
+libguestfs-test-tool

tests/tests.yml

@@ -5,9 +5,10 @@
   - role: standard-test-basic
     tags:
     - classic
+    required_packages:
+    - libguestfs
+    - libvirt-daemon-kvm
     tests:
     - libguestfs-test-tool:
         dir: .
-        run: libguestfs-test-tool
-    required_packages:
-    - libguestfs
+        run: ./run-libguestfs-test-tool.sh