New stable branch version 1.46.0.

0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch

@@ -1,51 +0,0 @@
-From 3a498512f58bc431db490e96cdb712b19389bda4 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 30 Mar 2021 12:41:58 +0100
-Subject: [PATCH] tests: Prefer xorriso over genisoimage to generate test.iso
-
-This Debian page explains the upstream situation:
-https://wiki.debian.org/genisoimage
-
-On Fedora, xorriso provides a compatibility program called "mkisofs".
-However this is not present in Debian.  Hence the choice to look for
-the program called "xorrisofs".
-
-(cherry picked from commit 2216ab2e328457ef172d6bfa534272edf2f81a3a)
----
- m4/guestfs-progs.m4   | 6 +++---
- test-data/Makefile.am | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/m4/guestfs-progs.m4 b/m4/guestfs-progs.m4
-index 2161b83136..1af1dc802a 100644
---- a/m4/guestfs-progs.m4
-+++ b/m4/guestfs-progs.m4
-@@ -39,10 +39,10 @@ AC_PROG_AWK
- 
- AC_PROG_LN_S
- 
--dnl Check for genisoimage/mkisofs
--AC_PATH_PROGS([GENISOIMAGE],[genisoimage mkisofs],[no],
-+dnl Check for xorriso/genisoimage/mkisofs.
-+AC_PATH_PROGS([MKISOFS],[xorrisofs genisoimage mkisofs],[no],
-     [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
--test "x$GENISOIMAGE" = "xno" && AC_MSG_ERROR([genisoimage must be installed])
-+test "x$MKISOFS" = "xno" && AC_MSG_ERROR([xorriso or genisoimage or mkisofs must be installed])
- 
- dnl Check for optional xmllint.
- AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])
-diff --git a/test-data/Makefile.am b/test-data/Makefile.am
-index 21b88b9a4b..d818037dce 100644
---- a/test-data/Makefile.am
-+++ b/test-data/Makefile.am
-@@ -96,6 +96,6 @@ test.iso: $(images_files)
- 	cp $(image_files) d/
- 	mkdir -p d/directory
- 	cd d && ln -sf /10klines abssymlink
--	cd d && $(GENISOIMAGE) -J -r -o ../$@-t .
-+	cd d && $(MKISOFS) -J -r -o ../$@-t .
- 	rm -rf d
- 	mv $@-t $@
--- 
-2.29.0.rc2
-

guestfs-tools.spec

@@ -15,18 +15,18 @@
 %global verify_tarball_signature 1
 
 # If there are patches which touch autotools files, set this to 1.
-%global patches_touch_autotools 1
+%global patches_touch_autotools %{nil}
 
 # The source directory.
-%global source_directory 1.45-development
+%global source_directory 1.46-stable
 
 # Filter perl provides.
 %{?perl_default_filter}
 
 Summary:       Tools to access and modify virtual machine disk images
 Name:          guestfs-tools
-Version:       1.45.3
+Version:       1.46.0
-Release:       4%{?dist}
+Release:       1%{?dist}
 License:       GPLv2+
 
 # Build only for architectures that have a kernel
@@ -44,9 +44,6 @@ Source1:       http://download.libguestfs.org/guestfs-tools/%{source_directory}/
 Source2:       libguestfs.keyring
 %endif
 
-# Upstream patch to change from genisoimage to xorriso.
-Patch1:        0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch
-
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool, gettext-devel
 %endif
@@ -405,6 +402,9 @@ end
 
 
 %changelog
+* Tue Apr 27 2021 Richard W.M. Jones <rjones@redhat.com> - 1.46.0-1
+- New stable branch version 1.46.0.
+
 * Wed Apr 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.45.3-4
 - Use Epoch 1 for virt-dib subpackage (only).
 

sources

@@ -1,2 +1,2 @@
-SHA512 (guestfs-tools-1.45.3.tar.gz) = c4fceba9e04222d573eb9bc4d4eff93a868073e43a5a78b994fd970885149dcc7a91c9c05b8564645fe7a201869c05368f400090fce731c51a3f0a30511e3c4c
+SHA512 (guestfs-tools-1.46.0.tar.gz) = 5ee9503910d36b3d46ac7b55b11a122e632d97e22f47bd90274ccbd9bc804545567491a88d18f88978113a96f671efeb86604aee6e797d93ae8c3472e63e9fe3
-SHA512 (guestfs-tools-1.45.3.tar.gz.sig) = 86bffa47d7e230c121a756d97d52349bf7cd40e23bf72ee64aa45188262fe0d542d7059cef1a440c412e5eab1fdd7d6ff5a039a897b7f9c669fb46886aec07ad
+SHA512 (guestfs-tools-1.46.0.tar.gz.sig) = 7b9776d512e400b4f0159c557af5d13a3a22188799d8137a3eb1c9f884bfcb6e8eb4cd258cb781b6f5c9d7d6a0864c44dd60b183554244550dd1b9d94e8dc1cf