From ae2b06d923704d2889dbe4bc2889d8d66222e503 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 24 Nov 2022 10:00:15 +0000
Subject: [PATCH] Disable OpenSUSE repo in virt-builder resolves: rhbz#2145160

---
 ...-builder-Disable-opensuse-repository.patch | 29 +++++++++++++++++++
 guestfs-tools.spec                            |  7 +++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 0015-RHEL-builder-Disable-opensuse-repository.patch

diff --git a/0015-RHEL-builder-Disable-opensuse-repository.patch b/0015-RHEL-builder-Disable-opensuse-repository.patch
new file mode 100644
index 0000000..6d18bd9
--- /dev/null
+++ b/0015-RHEL-builder-Disable-opensuse-repository.patch
@@ -0,0 +1,29 @@
+From 888ecde429ef6fab9567359abae1e2d04d552666 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 21 Nov 2022 13:03:22 +0000
+Subject: [PATCH] RHEL: builder: Disable opensuse repository
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2145160
+(cherry picked from commit 8e0e91c923bd7076fd906a71678ddd3f328ae2c0)
+---
+ builder/opensuse.conf.in | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/builder/opensuse.conf.in b/builder/opensuse.conf.in
+index 19f979699..a57fc6977 100644
+--- a/builder/opensuse.conf.in
++++ b/builder/opensuse.conf.in
+@@ -1,3 +1,7 @@
+-[opensuse.org]
+-uri=http://download.opensuse.org/repositories/Virtualization:/virt-builder-images/images/index
+-gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/opensuse.gpg
++# https://bugzilla.redhat.com/show_bug.cgi?id=2145160
++# This is disabled in RHEL by default, but you can enable it by
++# uncommenting the lines below.
++
++#[opensuse.org]
++#uri=http://download.opensuse.org/repositories/Virtualization:/virt-builder-images/images/index
++#gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/opensuse.gpg
+-- 
+2.31.1
+
diff --git a/guestfs-tools.spec b/guestfs-tools.spec
index 557d08e..1dfc2c3 100644
--- a/guestfs-tools.spec
+++ b/guestfs-tools.spec
@@ -26,7 +26,7 @@
 Summary:       Tools to access and modify virtual machine disk images
 Name:          guestfs-tools
 Version:       1.48.2
-Release:       7%{?dist}
+Release:       8%{?dist}
 License:       GPLv2+
 
 # Build only for architectures that have a kernel
@@ -69,6 +69,7 @@ Patch0011:     0011-sysprep-make-an-effort-to-cope-with-LUKS-on-LVM.patch
 Patch0012:     0012-sysprep-advise-against-cloning-VMs-with-internal-ful.patch
 Patch0013:     0013-builder-dib-Replace-On_exit.rmdir-with-On_exit.rm_rf.patch
 Patch0014:     0014-customize-Support-Rocky-Linux.patch
+Patch0015:     0015-RHEL-builder-Disable-opensuse-repository.patch
 
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool, gettext-devel
@@ -439,9 +440,11 @@ end
 
 
 %changelog
-* Wed Oct 12 2022 Richard W.M. Jones <rjones@redhat.com> - 1.48.2-7
+* Thu Nov 24 2022 Richard W.M. Jones <rjones@redhat.com> - 1.48.2-8
 - Support Rocky Linux in virt-customize
   resolves: rhbz#2133443
+- Disable OpenSUSE repo in virt-builder
+  resolves: rhbz#2145160
 
 * Fri Jul 15 2022 Richard W.M. Jones <rjones@redhat.com> - 1.48.2-5
 - Rebase to guestfs-tools 1.48.2