From e656ffdd3cbe1d408ff8a1bb045af54dbc74ae57 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 16 Apr 2020 13:25:50 +0100
Subject: [PATCH] New upstream stable version 1.42.0.

---
 sources       |  4 ++--
 virt-v2v.spec | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/sources b/sources
index 990fd50..dad45a4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-1.41.8.tar.gz) = c7d4f258aa347f3866193df3aa15938389f38f86d387a9b04fe2b250ff313edd4c9477e8ca5723a3bb3d536a2826ce5be93fb9b687865083afaab9fdeb473bd3
-SHA512 (virt-v2v-1.41.8.tar.gz.sig) = bbcf4e36505b388390cc971a95f12105cded7e53c7632057918cb2503b7b05ad6a92b6b6e6b08d9dd822fb03715868996045022fc1f8e43580835004215d76c0
+SHA512 (virt-v2v-1.42.0.tar.gz) = 75841717d54479443eb63365375e44d0b9189bb72ed761685081cc3bc53aa0f50954e72df07d23c95412f25eae12eb6c6e13a8c45ba9ffd8f27f861a326a53d7
+SHA512 (virt-v2v-1.42.0.tar.gz.sig) = 8986f41829ef5635ff8453bd798856c0bdfd1c6ebd7a844d8771c92e6c898fa5c308bb91b31ebc8ec239f3896fbd23e02bd0fe653800fe8804c960dae244dec2
diff --git a/virt-v2v.spec b/virt-v2v.spec
index bd918f7..0cac67d 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -2,14 +2,14 @@
 %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.41-development
+%global source_directory 1.42-stable
 
 Name:          virt-v2v
-Version:       1.41.8
-Release:       11%{?dist}
+Version:       1.42.0
+Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPLv2+
@@ -22,12 +22,6 @@ Source1:       http://download.libguestfs.org/virt-v2v/%{source_directory}/%{nam
 Source2:       libguestfs.keyring
 %endif
 
-# Upstream patches.
-Patch1:        0001-po-Remove-some-POTFILES-ml-which-aren-t-included-in-.patch
-Patch2:        0002-Add-license-file.patch
-Patch3:        0001-build-add-an-empty-config.sh.patch
-Patch4:        0001-tests-use-the-right-nbdkit-python3-plugin.patch
-
 # libguestfs hasn't been built on i686 for a while since there is no
 # kernel built for this architecture any longer and libguestfs rather
 # fundamentally depends on the kernel.  Therefore we must exclude this
@@ -208,6 +202,7 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllv2v_test_harness*
 %{_mandir}/man1/virt-v2v-output-local.1*
 %{_mandir}/man1/virt-v2v-output-openstack.1*
 %{_mandir}/man1/virt-v2v-output-rhv.1*
+%{_mandir}/man1/virt-v2v-release-notes-1.42.1*
 %{_mandir}/man1/virt-v2v-support.1*
 %{_mandir}/man1/virt-v2v-test-harness.1*
 %{_datadir}/virt-tools
@@ -230,6 +225,9 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllv2v_test_harness*
 
 
 %changelog
+* Thu Apr 16 2020 Richard W.M. Jones <rjones@redhat.com> - 1.42.0-1
+- New upstream stable version 1.42.0.
+
 * Sat Apr 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.41.8-11
 - Update all OCaml dependencies for RPM 4.16.