From 8841a928a7b09435a646e78cbb00709f07d8a884 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 19 Mar 2025 14:49:03 +0300 Subject: [PATCH] Revert OL changes --- .../1001-replaced-upstream-references.patch | 304 ------------------ SPECS/virt-v2v.spec | 9 +- 2 files changed, 1 insertion(+), 312 deletions(-) delete mode 100644 SOURCES/1001-replaced-upstream-references.patch diff --git a/SOURCES/1001-replaced-upstream-references.patch b/SOURCES/1001-replaced-upstream-references.patch deleted file mode 100644 index f0013e9..0000000 --- a/SOURCES/1001-replaced-upstream-references.patch +++ /dev/null @@ -1,304 +0,0 @@ -From a0b0015b884015b20a86cbc896ba55448f05e855 Mon Sep 17 00:00:00 2001 -From: Craig Guiller -Date: Fri, 5 Apr 2024 12:34:09 +0100 -Subject: [PATCH] replaced upstream references -Signed-off-by: Craig Guiller ---- - po/Makefile.am | 2 +- - po/cs.po | 3 +-- - po/de.po | 3 +-- - po/es.po | 3 +-- - po/fr.po | 3 +-- - po/gu.po | 3 +-- - po/hi.po | 3 +-- - po/ja.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/uk.po | 3 +-- - po/virt-v2v.pot | 3 +-- - podwrapper.pl.in | 4 ++-- - website/index.html.in | 6 +++--- - 19 files changed, 22 insertions(+), 38 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 415a9b9..bf996ff 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-01-04 17:06+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 19a5513..7b64f55 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-01-04 17:06+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 065cd2b..051af40 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-01-04 17:06+0000\n" - "PO-Revision-Date: 2015-03-16 07:04+0000\n" - "Last-Translator: Alex Puchades \n" -diff --git a/po/fr.po b/po/fr.po -index 7b0864b..41b9db7 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-01-04 17:06+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 02643ec..d53329c 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-01-04 17:06+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 11f334c..303063d 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-01-04 17:06+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 7c806c1..227b17e 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-01-04 17:06+0000\n" - "PO-Revision-Date: 2017-02-24 07:33+0000\n" - "Last-Translator: Copied by Zanata \n" -diff --git a/po/kn.po b/po/kn.po -index 430af05..66b794b 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-01-04 17:06+0000\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 172994f..0195197 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-01-04 17:06+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 cfa072d..49e5e6d 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-01-04 17:06+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 7757ba3..c91e1b0 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-01-04 17:06+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 cb0b6f9..11ee73f 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-01-04 17:06+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 9b4e9bc..c34e00d 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-01-04 17:06+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 d46571c..01f5206 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-01-04 17:06+0000\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 -

- - -diff --git a/po/virt-v2v.pot b/po/virt-v2v.pot -index 9642515..a82187a 100644 ---- a/po/virt-v2v.pot -+++ b/po/virt-v2v.pot -@@ -7,8 +7,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: virt-v2v 2.5.6\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-07-30 16:57+0100\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" --- -2.31.1 - diff --git a/SPECS/virt-v2v.spec b/SPECS/virt-v2v.spec index 7e7159d..f5c7e1f 100644 --- a/SPECS/virt-v2v.spec +++ b/SPECS/virt-v2v.spec @@ -8,7 +8,7 @@ Name: virt-v2v Epoch: 1 Version: 2.5.6 -Release: 9.0.1%{?dist} +Release: 9%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -55,9 +55,6 @@ Patch0024: 0024-convert-Use-yum-apt-.-for-package-removals-not-rpm-d.patch Patch0025: 0025-test-data-phony-fedora-Add-simple-static-bin-sh.patch Patch0026: 0026-convert-Handle-large-output-from-rpm-ql-command.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 @@ -360,10 +357,6 @@ make -C tests TESTS=test-v2v-fedora-luks-on-lvm-conversion.sh check %changelog -* Mon Mar 17 2025 EL Errata - 2.5.6-9.0.1 -- Replaced bugzilla.oracle.com references [Orabug: 34202300] -- replaced upstream references [Orabug:34089586] - * Thu Feb 27 2025 Richard W.M. Jones - 1:2.5.6-9 - Fix failure if the kernel-source package is installed in the source VM resolves: RHEL-81083