From dd9942713453a6b7f9b2285b1e56ea9e3dc4f6c4 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 12 Aug 2025 09:22:01 +0000 Subject: [PATCH] Revert OL modifications --- .../1001-replaced-upstream-references.patch | 350 ------------------ SOURCES/copy-patches.sh | 0 SPECS/virt-v2v.spec | 9 +- 3 files changed, 1 insertion(+), 358 deletions(-) delete mode 100644 SOURCES/1001-replaced-upstream-references.patch mode change 100644 => 100755 SOURCES/copy-patches.sh diff --git a/SOURCES/1001-replaced-upstream-references.patch b/SOURCES/1001-replaced-upstream-references.patch deleted file mode 100644 index dc425f3..0000000 --- a/SOURCES/1001-replaced-upstream-references.patch +++ /dev/null @@ -1,350 +0,0 @@ -From 0fbfa66f95181c6e3b784c8ea86e6a9faa3f4ea1 Mon Sep 17 00:00:00 2001 -From: Darren Archibald -Date: Wed, 19 Feb 2025 01:33:28 -0800 -Subject: [PATCH] replaced upstream references - -Signed-off-by: Darren Archibald ---- - 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 f1509d6..db4a502 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 95b1124..8bbc891 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: 2024-08-29 15:25+0100\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 e5adfcf..e4cf209 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: 2024-08-29 15:25+0100\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 97fa9cf..1a41da6 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: 2024-08-29 15:25+0100\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 04d6e7d..a7f6b9d 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: 2024-08-29 15:25+0100\n" - "PO-Revision-Date: 2022-12-23 18:20+0000\n" - "Last-Translator: Jan Kuparinen \n" -diff --git a/po/fr.po b/po/fr.po -index b6571f3..c145c11 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: 2024-08-29 15:25+0100\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 9d34a97..e3eecfe 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: 2024-08-29 15:25+0100\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 279dd88..f07556d 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: 2024-08-29 15:25+0100\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 6a02097..6274047 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: 2024-08-29 15:25+0100\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 bae787b..4d189c4 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: 2024-08-29 15:25+0100\n" - "PO-Revision-Date: 2023-11-26 21:01+0000\n" - "Last-Translator: Temuri Doghonadze \n" -diff --git a/po/kn.po b/po/kn.po -index bc830a0..43eab6a 100644 ---- a/po/kn.po -+++ b/po/kn.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: 2024-08-29 15:25+0100\n" - "PO-Revision-Date: 2015-02-21 10:50+0000\n" - "Last-Translator: Copied by Zanata \n" -diff --git a/po/ml.po b/po/ml.po -index e0e3d49..4073d4b 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: 2024-08-29 15:25+0100\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 931374e..a729ba2 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: 2024-08-29 15:25+0100\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 f94cd75..bc85acd 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: 2024-08-29 15:25+0100\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 2fe0840..38c1720 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: 2024-08-29 15:25+0100\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 f3237c9..c7082cb 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: 2024-08-29 15:25+0100\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 4b6f1b8..c90994b 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: 2024-08-29 15:25+0100\n" - "PO-Revision-Date: 2024-01-15 13:36+0000\n" - "Last-Translator: Weblate Translation Memory \n" -diff --git a/podwrapper.pl.in b/podwrapper.pl.in -index c99563c..14198cf 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/SOURCES/copy-patches.sh b/SOURCES/copy-patches.sh old mode 100644 new mode 100755 diff --git a/SPECS/virt-v2v.spec b/SPECS/virt-v2v.spec index 85117d6..7d860ec 100644 --- a/SPECS/virt-v2v.spec +++ b/SPECS/virt-v2v.spec @@ -8,7 +8,7 @@ Name: virt-v2v Epoch: 1 Version: 2.7.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 @@ -72,9 +72,6 @@ Patch0041: 0041-Modify-configure_pnputil_install-script-to-check.patch Patch0042: 0042-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch Patch0043: 0043-remove-timeout-before-installing-virtio-win-drivers.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 @@ -375,10 +372,6 @@ make -C tests TESTS=test-fedora-luks-on-lvm-conversion.sh check %changelog -* Thu Jul 24 2025 EL Errata - 2.7.1-10.0.1 -- Replaced bugzilla.oracle.com references [Orabug: 34202300] -- replaced upstream references [Orabug:34089586] - * Fri Jul 18 2025 Richard W.M. Jones - 1:2.7.1-10 - Fix installation of drivers on firstboot with pending reboots resolves: RHEL-103421