import leapp-repository-0.17.0-3.el8

SOURCES/0004-Enforce-the-removal-of-rubygem-irb-do-not-install-it.patch

@@ -0,0 +1,23 @@
+From 496abd1775779054377c5e35ae96fa4d390bab42 Mon Sep 17 00:00:00 2001
+From: Petr Stodulka <pstodulk@redhat.com>
+Date: Tue, 19 Apr 2022 21:51:03 +0200
+Subject: [PATCH] Enforce the removal of rubygem-irb (do not install it)
+
+---
+ etc/leapp/transaction/to_remove | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/etc/leapp/transaction/to_remove b/etc/leapp/transaction/to_remove
+index 0feb782..07c6864 100644
+--- a/etc/leapp/transaction/to_remove
++++ b/etc/leapp/transaction/to_remove
+@@ -1,3 +1,6 @@
+ ### List of packages (each on new line) to be removed from the upgrade transaction
+ # Removing initial-setup package to avoid it asking for EULA acceptance during upgrade - OAMG-1531
+ initial-setup
++
++# temporary workaround for the file conflict symlink <-> dir (#2030627)
++rubygem-irb
+-- 
+2.35.1
+

SPECS/leapp-repository.spec

@@ -42,7 +42,7 @@ py2_byte_compile "%1" "%2"}
 
 Name:           leapp-repository
 Version:        0.17.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Repositories for leapp
 
 License:        ASL 2.0
@@ -57,6 +57,10 @@ BuildArch:      noarch
 # Patch0001:    filename.patch
 Patch0001:      0001-CheckVDO-Ask-user-only-faiulres-and-undetermined-dev.patch
 
+## DO NOT REMOVE THIS PATCH UNLESS THE RUBYGEM-IRB ISSUE IS RESOLVED IN ACTORS!
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=2030627
+Patch0004:      0004-Enforce-the-removal-of-rubygem-irb-do-not-install-it.patch
+
 
 %description
 %{summary}
@@ -190,6 +194,7 @@ Requires:   dracut
 # APPLY PATCHES HERE
 # %%patch0001 -p1
 %patch0001 -p1
+%patch0004 -p1
 
 
 %build
@@ -264,6 +269,11 @@ done;
 # no files here
 
 %changelog
+* Wed Sep 07 2022 Petr Stodulka <pstodulk@redhat.com> - 0.17.0-3
+- Adding back instruction to not install rubygem-irb during the in-place upgrade
+  to prevent conflict between files
+- Resolves: rhbz#2090995
+
 * Wed Sep 07 2022 Petr Stodulka <pstodulk@redhat.com> - 0.17.0-2
 - Update VDO checks to enable user to decide the system state on check failures
   and undetermined block devices