Manually merge fedora/rawhide up to commit 29135227ce9b

resolves: rhbz#1950634
This commit is contained in:
Richard W.M. Jones 2021-06-16 13:21:19 +01:00
parent 024316f718
commit c7ac006808
2 changed files with 16 additions and 15 deletions

View File

@ -1,2 +1,2 @@
SHA512 (virt-v2v-1.44.0.tar.gz) = 9d8de6c6376dd33a5fb4d5fd10fac13a8bce7d834bbb65274a09ae6558b2c3107c5ccb8b39b330a27ccff09313eb72cf7139f378d5e427af67589443168d7e17
SHA512 (virt-v2v-1.44.0.tar.gz.sig) = e6b830389d475bb5514b8f6c6f273d06ed90bc31ff785c709964e4f492cbca6a5d78b25ad60605f9778ac9300754d62630481c80d4232d0fa17fefde65d22a90
SHA512 (virt-v2v-1.45.1.tar.gz) = be9cb75c2fe01e989d0b1f35e8496ed7e78076d17b4a4e7b24b6372a8cc3ed633d749dc5e5adf2d7c0d2a8a61f81b3d71cba47917f6a5e91edca341f2827627e
SHA512 (virt-v2v-1.45.1.tar.gz.sig) = 94afc18b3c5954b318dcf668fc6f71b5a3f9b0568f2b0bc27eea92a92096a1197cc24048b18df2a2d69ece56b2864ba5dcc1e4c0d469903ff631d541646ea3d2

View File

@ -10,12 +10,12 @@
%endif
# The source directory.
%global source_directory 1.44-stable
%global source_directory 1.45-development
Name: virt-v2v
Epoch: 1
Version: 1.44.0
Release: 2%{?dist}
Version: 1.45.1
Release: 1%{?dist}
Summary: Convert a virtual machine to run on KVM
License: GPLv2+
@ -138,6 +138,12 @@ Requires: nbdkit-vddk-plugin
# For rhsrvany.exe, used to install firstboot scripts in Windows guests.
Requires: mingw32-srvany >= 1.0-13
# On RHEL, virtio-win should be used to install virtio drivers
# and qemu-ga in converted guests. (RHBZ#1972644)
%if 0%{?rhel}
Recommends: virtio-win
%endif
%description
Virt-v2v converts a single guest from a foreign hypervisor to run on
@ -215,16 +221,6 @@ pushd $RPM_BUILD_ROOT%{_datadir}/virt-tools
ln -sf /usr/i686-w64-mingw32/sys-root/mingw/bin/rhsrvany.exe
popd
# Delete the v2v test harness.
rm -r $RPM_BUILD_ROOT%{_libdir}/ocaml/v2v_test_harness
rm -r $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllv2v_test_harness*
rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-test-harness.1*
# Delete copy-to-local tool.
rm $RPM_BUILD_ROOT%{_bindir}/virt-v2v-copy-to-local
rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-copy-to-local.1*
rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local
# Find locale files.
%find_lang %{name}
@ -289,6 +285,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local
%changelog
* Wed Jun 16 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.1-1
- New upstream development version 1.45.1.
- Require virtio-win on RHEL (RHBZ#1972644).
- v2v-test-harness, virt-v2v-copy-to-local have been removed upstream.
* Thu Jun 10 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.44.0-2
- nbdkit-vddk-plugin dep only exists on x86-64.