diff --git a/1001-replaced-upstream-references.patch b/1001-replaced-upstream-references.patch deleted file mode 100644 index b5bc13e..0000000 --- a/1001-replaced-upstream-references.patch +++ /dev/null @@ -1,351 +0,0 @@ -From 9bd7e17d0b34f939eab0c18cef7fd4bb74269c20 Mon Sep 17 00:00:00 2001 -From: Darren Archibald -Date: Tue, 9 Sep 2025 04:07:35 -0700 -Subject: [PATCH] replaced upstream references - -Signed-off-by: Darren Archibald -Signed-off-by: Akshata Konala ---- - po/Makefile.am | 2 +- - po/cs.po | 3 +-- - po/de.po | 3 +-- - po/es.po | 3 +-- - po/fi.po | 3 +-- - po/fr.po | 3 +-- - po/gu.po | 3 +-- - po/hi.po | 3 +-- - po/ja.po | 3 +-- - po/ka.po | 3 +-- - po/kn.po | 3 +-- - po/ml.po | 3 +-- - po/mr.po | 3 +-- - po/nl.po | 3 +-- - po/or.po | 3 +-- - po/pa.po | 3 +-- - po/pl.po | 3 +-- - po/si.po | 3 +-- - po/uk.po | 3 +-- - po/virt-v2v.pot | 3 +-- - podwrapper.pl.in | 4 ++-- - website/index.html.in | 6 +++--- - 22 files changed, 25 insertions(+), 44 deletions(-) - -diff --git a/po/Makefile.am b/po/Makefile.am -index 08d9dbe..61f472b 100644 ---- a/po/Makefile.am -+++ b/po/Makefile.am -@@ -19,7 +19,7 @@ include $(top_srcdir)/subdir-rules.mk - - DOMAIN = $(PACKAGE_NAME) - COPYRIGHT_HOLDER = Red Hat Inc. --MSGID_BUGS_ADDRESS = https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Virtualization+Tools -+MSGID_BUGS_ADDRESS = https://github.com/oracle/oracle-linux - - # Languages. - # Don't use LINGUAS (uppercase) as Gentoo defines it (RHBZ#804464). -diff --git a/po/cs.po b/po/cs.po -index 55c4fdc..5003e14 100644 ---- a/po/cs.po -+++ b/po/cs.po -@@ -2,8 +2,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2023-04-08 18:20+0000\n" - "Last-Translator: Pavel Borecki \n" -diff --git a/po/de.po b/po/de.po -index e8d9053..835535e 100644 ---- a/po/de.po -+++ b/po/de.po -@@ -9,8 +9,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2015-02-21 10:48+0000\n" - "Last-Translator: Copied by Zanata \n" -diff --git a/po/es.po b/po/es.po -index 1a63337..8800235 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -10,8 +10,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2015-03-16 07:04+0000\n" - "Last-Translator: Alex Puchades \n" -diff --git a/po/fi.po b/po/fi.po -index 56f9917..b077010 100644 ---- a/po/fi.po -+++ b/po/fi.po -@@ -6,8 +6,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: virt-v2v 1.43.4\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2025-01-09 11:33+0000\n" - "Last-Translator: Ricky Tigg \n" -diff --git a/po/fr.po b/po/fr.po -index 2db1ae1..2ba25d0 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -10,8 +10,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2023-03-21 09:20+0000\n" - "Last-Translator: grimst \n" -diff --git a/po/gu.po b/po/gu.po -index 5b4e798..9c540cd 100644 ---- a/po/gu.po -+++ b/po/gu.po -@@ -8,8 +8,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2015-02-21 10:49+0000\n" - "Last-Translator: Copied by Zanata \n" -diff --git a/po/hi.po b/po/hi.po -index a3983ed..0364d75 100644 ---- a/po/hi.po -+++ b/po/hi.po -@@ -8,8 +8,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2015-02-21 10:49+0000\n" - "Last-Translator: Copied by Zanata \n" -diff --git a/po/ja.po b/po/ja.po -index 23d34f2..c14299e 100644 ---- a/po/ja.po -+++ b/po/ja.po -@@ -9,8 +9,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2017-02-24 07:33+0000\n" - "Last-Translator: Copied by Zanata \n" -diff --git a/po/ka.po b/po/ka.po -index 78ebee4..b116e86 100644 ---- a/po/ka.po -+++ b/po/ka.po -@@ -6,8 +6,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: virt-v2v 2.1.1\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2025-01-09 09:27+0000\n" - "Last-Translator: Weblate Translation Memory \n" -diff --git a/po/ml.po b/po/ml.po -index 7a3f071..7de8c16 100644 ---- a/po/ml.po -+++ b/po/ml.po -@@ -7,8 +7,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2015-02-21 10:50+0000\n" - "Last-Translator: Copied by Zanata \n" -diff --git a/po/mr.po b/po/mr.po -index 8222d63..7f55091 100644 ---- a/po/mr.po -+++ b/po/mr.po -@@ -8,8 +8,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2015-02-21 10:51+0000\n" - "Last-Translator: Copied by Zanata \n" -diff --git a/po/nl.po b/po/nl.po -index 06df912..b25b908 100644 ---- a/po/nl.po -+++ b/po/nl.po -@@ -9,8 +9,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2015-02-21 10:51+0000\n" - "Last-Translator: Copied by Zanata \n" -diff --git a/po/or.po b/po/or.po -index 2422cc3..92a2500 100644 ---- a/po/or.po -+++ b/po/or.po -@@ -7,8 +7,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2015-02-21 10:51+0000\n" - "Last-Translator: Copied by Zanata \n" -diff --git a/po/pa.po b/po/pa.po -index e2465b6..73a8db6 100644 ---- a/po/pa.po -+++ b/po/pa.po -@@ -8,8 +8,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2015-02-21 10:52+0000\n" - "Last-Translator: Copied by Zanata \n" -diff --git a/po/pl.po b/po/pl.po -index 77f4651..16c7459 100644 ---- a/po/pl.po -+++ b/po/pl.po -@@ -11,8 +11,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: libguestfs 1.39.12\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-02-27 18:15+0000\n" - "PO-Revision-Date: 2024-01-15 13:36+0000\n" - "Last-Translator: Weblate Translation Memory \n" -diff --git a/po/virt-v2v.pot b/po/virt-v2v.pot -index 60bbf0c..ea2fb85 100644 ---- a/po/virt-v2v.pot -+++ b/po/virt-v2v.pot -@@ -7,8 +7,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: virt-v2v 2.8.1\n" --"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" --"component=libguestfs&product=Virtualization+Tools\n" -+"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" - "POT-Creation-Date: 2025-06-26 16:05+0100\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" -diff --git a/podwrapper.pl.in b/podwrapper.pl.in -index d7973fc..0a196f3 100755 ---- a/podwrapper.pl.in -+++ b/podwrapper.pl.in -@@ -432,10 +432,10 @@ my $reporting_bugs = - "=head1 BUGS - - To get a list of bugs against libguestfs, use this link: --L -+L - - To report a new bug against libguestfs, use this link: --L -+L - - When reporting a bug, please supply: - -diff --git a/website/index.html.in b/website/index.html.in -index f578523..e1e1592 100644 ---- a/website/index.html.in -+++ b/website/index.html.in -@@ -160,12 +160,12 @@ For testers: -

Bug reports

- -

--List of bugs in libguestfs and --in Fedora packaging of libguestfs -+List of bugs in libguestfs and -+in Community packaging of libguestfs -

- -

--Enter a new bug report -+Enter a new bug report -

- - --- -2.31.1 - diff --git a/copy-patches.sh b/copy-patches.sh old mode 100644 new mode 100755 diff --git a/virt-v2v.spec b/virt-v2v.spec index e67ab8d..b68179c 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.8.1 -Release: 10.0.1%{?dist} +Release: 10%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -60,9 +60,6 @@ Patch0030: 0030-output-kubevirt-Add-bootOrder-to-Kubevirt-YAML.patch Patch0031: 0031-convert-Look-for-GRUB-signature-first-to-identify-bo.patch Patch0032: 0032-lib-types.ml-Fix-formatting-of-debug-message.patch -# Oracle patch -Patch1001: 1001-replaced-upstream-references.patch - %if !0%{?rhel} # libguestfs hasn't been built on i686 for a while since there is no # kernel built for this architecture any longer and libguestfs rather @@ -352,10 +349,6 @@ done %changelog -* Wed Nov 12 2025 EL Errata - 2.8.1-10.0.1 -- Replaced bugzilla.oracle.com references [Orabug: 34202300] -- replaced upstream references [Orabug:34089586] - * Sep 25 2025 Richard W.M. Jones - 1:2.8.1-10 - Fix setting boot order for Linux BIOS guests resolves: RHEL-108991