diff --git a/gating.yaml b/gating.yaml index 8c4c77a..336c565 100755 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,6 @@ --- !Policy product_versions: - - rhel-9 + - rhel-* decision_context: osci_compose_gate rules: - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/sources b/sources index bd7cbc4..2a2aa81 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.5.3.tar.gz) = 9f6e0618db7c6e57192ad83aeb9f4978935aa387fabe62e952c5ea473fe88973323fb02d43eac615dca33b88590f8a824a3ea761691d273e6853674974c193da -SHA512 (virt-v2v-2.5.3.tar.gz.sig) = c4fc7f3ff201501bdeda1202268da9fa9d393131762a28f38e0addd6397ba2f92a1c4bf811672cac66b54f095293e90a757786f2aec14c2f73da8035403c6b19 +SHA512 (virt-v2v-2.6.0.tar.gz) = bc7ecf99e66bae057eaf5d7c82ca38ded4aa6ef8732544bc7079f2894c9c79542a415fede02cf8c2cb7e83756683457c705f816b1da57e5ca9565350b9376a73 +SHA512 (virt-v2v-2.6.0.tar.gz.sig) = 630166caf41d48ac2efca646611248263e58a4e7e644a7606b647911164a39a449ae3916d05248d48e80925f3f9179b1cfb850001b0f3dd30a48c301d62b11a0 diff --git a/virt-v2v.spec b/virt-v2v.spec index 97966eb..c0a2e7b 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -2,11 +2,11 @@ %global verify_tarball_signature 1 # The source directory. -%global source_directory 2.5-development +%global source_directory 2.6-stable Name: virt-v2v Epoch: 1 -Version: 2.5.3 +Version: 2.6.0 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -48,7 +48,7 @@ BuildRequires: ocaml >= 4.04 BuildRequires: libguestfs-devel >= 1:1.49.8-1 BuildRequires: augeas-devel -BuildRequires: bash-completion, bash-completion-devel +BuildRequires: bash-completion BuildRequires: file-devel BuildRequires: gettext-devel BuildRequires: jansson-devel @@ -74,6 +74,7 @@ BuildRequires: ocaml-ounit-devel %endif # These are for running our limited test. +BuildRequires: glibc-utils BuildRequires: %{_bindir}/qemu-nbd BuildRequires: %{_bindir}/nbdcopy BuildRequires: %{_bindir}/nbdinfo @@ -221,8 +222,10 @@ make V=1 %{?_smp_mflags} find $RPM_BUILD_ROOT -name '*.la' -delete %if 0%{?rhel} -# On RHEL remove virt-v2v-in-place. -rm $RPM_BUILD_ROOT%{_bindir}/virt-v2v-in-place +# On RHEL move virt-v2v-in-place to libexec since it is not supported, +# and remove the documentation. +mkdir -p $RPM_BUILD_ROOT%{_libexecdir} +mv $RPM_BUILD_ROOT%{_bindir}/virt-v2v-in-place $RPM_BUILD_ROOT%{_libexecdir}/ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1* %endif @@ -261,23 +264,25 @@ done %{_bindir}/virt-v2v %if !0%{?rhel} %{_bindir}/virt-v2v-in-place +%else +%{_libexecdir}/virt-v2v-in-place %endif %{_bindir}/virt-v2v-inspector %{_mandir}/man1/virt-v2v.1* %{_mandir}/man1/virt-v2v-hacking.1* %{_mandir}/man1/virt-v2v-input-vmware.1* -%{_mandir}/man1/virt-v2v-input-xen.1* %if !0%{?rhel} +%{_mandir}/man1/virt-v2v-input-xen.1* %{_mandir}/man1/virt-v2v-in-place.1* %endif %{_mandir}/man1/virt-v2v-inspector.1* %{_mandir}/man1/virt-v2v-output-local.1* %{_mandir}/man1/virt-v2v-output-openstack.1* +%if !0%{?rhel} %{_mandir}/man1/virt-v2v-output-rhv.1* +%endif %{_mandir}/man1/virt-v2v-release-notes-1.42.1* -%{_mandir}/man1/virt-v2v-release-notes-2.0.1* -%{_mandir}/man1/virt-v2v-release-notes-2.2.1* -%{_mandir}/man1/virt-v2v-release-notes-2.4.1* +%{_mandir}/man1/virt-v2v-release-notes-2.*.1* %{_mandir}/man1/virt-v2v-support.1* @@ -297,6 +302,36 @@ done %changelog +* Tue Oct 08 2024 Richard W.M. Jones - 1:2.6.0-1 +- New upstream stable version 2.6.0 + +* Thu Oct 03 2024 Richard W.M. Jones - 1:2.5.11-1 +- New upstream development version 2.5.11 + +* Tue Sep 10 2024 Richard W.M. Jones - 1:2.5.10-1 +- New upstream development version 2.5.10 + +* Thu Aug 29 2024 Richard W.M. Jones - 1:2.5.9-1 +- New upstream development version 2.5.9 + +* Tue Aug 20 2024 Richard W.M. Jones - 1:2.5.8-1 +- New upstream development version 2.5.8 + +* Tue Aug 13 2024 Richard W.M. Jones - 1:2.5.7-1 +- New upstream development version 2.5.7 + +* Tue Jul 30 2024 Richard W.M. Jones - 1:2.5.6-1 +- New upstream development version 2.5.6 + +* Thu Jul 11 2024 Richard W.M. Jones - 1:2.5.5-1 +- New upstream development version 2.5.5 + +* Thu Apr 25 2024 Richard W.M. Jones - 1:2.5.4-1 +- New upstream development version 2.5.4 + +* Fri Apr 12 2024 Richard W.M. Jones - 1:2.5.3-2 +- Fix bytecode compilation (RHBZ#2274708) + * Thu Apr 11 2024 Richard W.M. Jones - 1:2.5.3-1 - New development branch version 2.5.3 - Unconditionally run autoreconf. @@ -306,7 +341,6 @@ done * Tue Mar 12 2024 Richard W.M. Jones - 1:2.5.2-1 - New development branch version 2.5.2 -- BR bash-completion-devel (new in Rawhide) * Sat Jan 27 2024 Fedora Release Engineering - 1:2.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild