SOURCES/0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch

@@ -40,8 +40,5 @@ index 51694ac2..30de0275 100644
  }
  
 -- 
-<<<<<<< HEAD
-2.45.2
-=======
 2.47.0
->>>>>>> ef02e9e (Import from CS git)
+

SPECS/leapp-repository.spec

@@ -50,10 +50,9 @@ py2_byte_compile "%1" "%2"}
 # to create such an rpm. Instead, we are going to introduce new naming for
 # RHEL 8+ packages to be consistent with other leapp projects in future.
 
-Epoch:		1
 Name:           leapp-repository
 Version:        0.21.0
-Release:        4%{?dist}.elevate.1
+Release:        4%{?dist}
 Summary:        Repositories for leapp
 
 License:        ASL 2.0
@@ -107,7 +106,6 @@ Patch0038:      0038-userspacegen-rhui-remove-repofiles-only-if-now-owned.patch
 Patch0039:      0039-Enable-IPU-for-EL-9.6-and-drop-EL-8.8-9.2.patch
 Patch0040:      0040-spec-drop-the-etc-leapp-actor_confid.d-dir.patch
 Patch0041:      0041-feat-net-naming-scheme-enable-by-default.patch
-Patch0100:      leapp-repository-0.21.0-elevate.patch
 
 
 %description
@@ -281,7 +279,7 @@ Requires:   libdb-utils
 %patch -P 0003 -p1
 %patch -P 0004 -p1
 %patch -P 0005 -p1
-# %patch -P 0006 -p1 # the patch is a part of Vendors support
+%patch -P 0006 -p1
 %patch -P 0007 -p1
 %patch -P 0008 -p1
 %patch -P 0009 -p1
@@ -314,10 +312,9 @@ Requires:   libdb-utils
 %patch -P 0036 -p1
 %patch -P 0037 -p1
 %patch -P 0038 -p1
-# %patch -P 0039 -p1 # ELevate provides own upgrade_paths.json and version.py
+%patch -P 0039 -p1
 %patch -P 0040 -p1
 %patch -P 0041 -p1
-%patch -P 0100 -p1
 
 
 %build
@@ -387,9 +384,6 @@ done;
 %dir %{custom_repositorydir}
 %dir %{leapp_python_sitelib}/leapp/cli/commands
 %config %{_sysconfdir}/leapp/files/*
-%exclude %{_sysconfdir}/leapp/files/device_driver_deprecation_data.json
-%exclude %{_sysconfdir}/leapp/files/pes-events.json
-%exclude %{_sysconfdir}/leapp/files/repomap.json
 # uncomment to package installed configs
 #%%config %%{_sysconfdir}/leapp/actor_conf.d/*
 %{_sysconfdir}/leapp/repos.d/*
@@ -402,20 +396,10 @@ done;
 # no files here
 
 %changelog
-* Mon Nov 25 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-4.elevate.1
-- Skip patches:
- - 0006-ReadOfKernelArgsError-fix-the-error.patch
- - 0039-Enable-IPU-for-EL-9.6-and-drop-EL-8.8-9.2.patch
-- Exclude data files (from /etc/leapp/files) which are part of leapp-data-*: device_driver_deprecation_data.json, pes-events.json, repomap.json
-
 * Tue Nov 19 2024 Matej Matuska <mmatuska@redhat.com> - 0.21.0-4
 - Use net.naming-scheme by default
 - Resolves: RHEL-23473
 
-* Tue Nov 19 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-2.elevate.4
-- Update ELevate patch:
- - extend update path for 8 and 8.10 with 9.5 target
-
 * Mon Nov 18 2024 Petr Stodulka <pstodulk@redhat.com> - 0.21.0-3
 - Introduce upgrade path 8.10 -> 9.6
 - Require leapp-framework 6.0+
@@ -434,19 +418,6 @@ done;
 - Resolves: RHEL-67621, RHEL-57064, RHEL-56251, RHEL-50686, RHEL-41193
 - Resolves: RHEL-34570, RHEL-26459, RHEL-23473, RHEL-16881, RHEL-3294
 
-* Mon Oct 07 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-2.elevate.3
-- Update ELevate patch:
- - remove '9.5' target from upgrade path until it is not released
- - extend upgrade path with ability to elevate AlmaLinux to "8.7", "8.8", "8.9", "8.10" and "9.0", "9.1", "9.2", "9.3", "9.4" versions with --target option
-
-* Thu Aug 29 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-2.elevate.2
-- Update ELevate patch:
- - make sure 'efi_finalization_fix' step runs before 'kernelcmdlineconfig'
- - fix no attribute 'Hints' error for 'leapp.reporting' module
-
-* Thu Aug 22 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-2.elevate.1
-- ELevate vendors support
-
 * Mon Aug 19 2024 Petr Stodulka <pstodulk@redhat.com> - 0.21.0-2
 - Updated SPEC file to drop leapp repositories unrelated to IPU 8 -> 9
 - Resolves: RHEL-27847
@@ -1202,3 +1173,4 @@ done;
 * Wed Nov 07 2018 Petr Stodulka <pstodulk@redhat.com> - 0.3-1
 - Initial RPM
   Resolves: #1636481
+