Update leapp-repository-*-fapolicyd package requirement to include epoch

Reviewed-on: #26

.gitignore

@@ -1,2 +1,2 @@
 SOURCES/deps-pkgs-13.tar.gz
-SOURCES/leapp-repository-0.25.0.tar.gz
+SOURCES/leapp-repository-0.23.0.tar.gz

.leapp-repository.metadata

@@ -1,2 +1,2 @@
 3590b33b4a79ebe62f5cfa0eeca7efb41d526498 SOURCES/deps-pkgs-13.tar.gz
-31f86553af44a2dc55ccca0ef15f90a6028b73e9 SOURCES/leapp-repository-0.25.0.tar.gz
+b5b541cc0c0372ee476f0ab6073a62e67290d031 SOURCES/leapp-repository-0.23.0.tar.gz

SPECS/leapp-repository.spec

@@ -50,9 +50,10 @@ 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.25.0
-Release:        1%{?dist}
+Version:        0.23.0
+Release:        1%{?dist}.elevate.1.1
 Summary:        Repositories for leapp
 
 License:        ASL 2.0
@@ -66,6 +67,8 @@ BuildArch:      noarch
 ### PATCHES HERE
 # Patch0001:    filename.patch
 
+Patch0100:      leapp-repository-0.23.0-elevate.patch
+
 
 %description
 %{summary}
@@ -120,7 +123,7 @@ Requires:       leapp-repository-dependencies = %{leapp_repo_deps}
 
 # IMPORTANT: this is capability provided by the leapp framework rpm.
 # Check that 'version' instead of the real framework rpm version.
-Requires:       leapp-framework >= 6.6
+Requires:       leapp-framework >= 6.1
 
 # Since we provide sub-commands for the leapp utility, we expect the leapp
 # tool to be installed as well.
@@ -132,7 +135,7 @@ Requires:   cpio
 
 # Subpackage for managing fapolicyd rules for %{lpr_name} installed only if
 # fapolicyd is present on the system
-Requires:       (%{lpr_name}-fapolicyd = %{version}-%{release} if fapolicyd)
+Requires:       (%{lpr_name}-fapolicyd = %{epoch}:%{version}-%{release} if fapolicyd)
 
 # The leapp-repository rpm is renamed to %%{lpr_name}
 Obsoletes:      leapp-repository < 0.14.0-5
@@ -247,6 +250,7 @@ Requires:   fapolicyd
 # APPLY PATCHES HERE
 # %%patch -P 0001 -p1
 
+%patch -P 0100 -p1
 
 %build
 cp -a leapp*deps*el%{next_major_ver}.noarch.rpm repos/system_upgrade/%{repo_shortname}/files/bundled-rpms/
@@ -327,9 +331,13 @@ fi
 %config %{_sysconfdir}/leapp/files/*
 # uncomment to package installed configs
 #%%config %%{_sysconfdir}/leapp/actor_conf.d/*
+%exclude %{_sysconfdir}/leapp/files/device_driver_deprecation_data.json
+%exclude %{_sysconfdir}/leapp/files/pes-events.json
+%exclude %{_sysconfdir}/leapp/files/repomap.json
 %{_sysconfdir}/leapp/repos.d/*
 %{_sysconfdir}/leapp/transaction/*
 %{repositorydir}/*
+%exclude %{repositorydir}/system_upgrade/common/files/distro/centos/rpm-gpg/*
 %{leapp_python_sitelib}/leapp/cli/commands/*
 
 
@@ -342,110 +350,11 @@ fi
 
 
 %changelog
-* Thu Jul 30 2026 Karolina Kula <kkula@redhat.com> - 0.25.0-1
-- Rebase to new upstream 0.25.0
-- Inhibit the upgrade when machine ID is missing or invalid
-- Fix check of Ceph/LUKS volumes based on UUIDs
-- Do not crash when failing to mount a pseudo filesystem during upgrade
-- Prevent hanging system upgrade boot on systems with RAID and defined `resume` on kernel command line
-- ARM: Do not update EFI boot order if DNF dry run fails
-- Fix handling of Jboss EAP during the upgrade
-- Introduce upgrades with conversions from Rocky Linux
-- Resolves: RHEL-162410, RHEL-16320, RHEL-188369, RHEL-213986, RHEL-50161 , RHEL-95495 , RHEL-95541
+* Fri Feb 27 2026 Yuriy Kohut <ykohut@almalinux.org> - 0.23.0-1.elevate.1.1
+- Update %{lpr_name}-fapolicyd package requirement to include epoch
 
-* Thu Jun 25 2026 Matej Matuska <mmatuska@redhat.com> - 0.24.0-3
-- Requires leapp-framework 6.6+
-- Initial implementation of upgrades on systems with configured Software RAID
-- Install the kernel variant matching the system memory page size on ARM systems
-- Fix multipath device initialization race in the upgrade environment
-- Detect misconfigured /var/run on the source system
-- Detect misconfigured kernel & systemd API mountpoints in FSTAB
-- Drop the inconsistent report about used CRB repositories
-- Ensure SELinux is set to permissive mode during the upgrade even when enforcing=1 is set on the kernel cmdline
-- FIX additional AVC SELinux warnings
-- Fix mount failures for FSTAB entries with the `nofail` option specified
-- Fix source and target distribution names in /etc/migration-results
-- Fix target system initramfs containing outdated configuration files in some circumstances
-- Fix upgrade crashing when dnf repofiles contain URL encoded characters
-- Fix upgrade incorrectly resuming during SELinux relabeling
-- Fix upgrades for systems with /boot/efi on a Software RAID
-- Fix upgrades on systems with multiple LUKS devices
-- Fix upgrades with the RealTime kernel on CentOS Stream
-- Inhibit the upgrade when network devices configured with ifcfg files could depend on NM
-- Introduce rhui.obsolete_gpg_keys configuration option for the removal of obsoleted RPM GPG keys of RHUI Cloud providers
-- LiveMode: Fix system version determination in the upgrade environment on CentOS Stream
-- LiveMode: Fix upgrade getting stuck when the `.leapp_upgrade_failed` file exists
-- Unify behaviour of upgrades on systems with enabled CRB repositories and explicitly required CRB repositories by user during the upgrade
-- Resolves: RHEL-3289, RHEL-17842, RHEL-36249, RHEL-56040, RHEL-56176, RHEL-60060, RHEL-76846, RHEL-104384, RHEL-145136, RHEL-148631, RHEL-162192, RHEL-185508
-
-* Fri Apr 17 2026 Matej Matuska <mmatuska@redhat.com> - 0.24.0-2
-- Introduce new upgrade paths 8.10 -> 9.9
-- Requires leapp-framework 6.5+
-- Modify keys for several reports that have been inconsistent between major releases. The keys are now independent of the used upgrade path.
-- Enable the logrotate timer automatically
-- Fix AVC SELinux warnings caused by leapp execution
-- Fix the upgrade with LiveMode on systems with FIPS
-- Livemode: Fix the upgrade on systems where the generated live image is not in rootfs
-- Fix failing upgrades with hugetlbfs file systems specified in FSTAB
-- Fix scan of physical network interfaces and ethX detection
-- Fix detection of network interfaces with biosdevname naming on Dell machines
-- Fix quoting in list representation of remediation commands
-- Consider RHUI source clients as signed by distribution vendor
-- Ensure that greenboot packages are removed during the upgrade
-- Respect names of distributions used for the IPU in preupgrade reports
-- Minor updates in reports
-- Regenerate GRUB2 config during conversions
-- Update leapp data files
-- Introduce DISTRO_REPORT_NAMES in the distro library to provide unified names for linux distributions for the use in leapp reports
-- Resolves: RHEL-3370, RHEL-17361, RHEL-104379, RHEL-110712, RHEL-129571, RHEL-130948
-
-* Tue Feb 10 2026 Matej Matuska <mmatuska@redhat.com> - 0.24.0-1
-- Rebase to new upstream 0.24.0
-- Introduce new IPU path 8.10 -> 9.8
-- Remove obsoleted IPU paths
-- Fix the upgrade for systems with installed kernel-rt
-- Enable php:8.2 module stream if enabled on the source system
-- Skip check for required baseos & appstream repos when upgrading from CS 8
-- Improve the error message when a problematic DNF repository definition is detected
-- Process enabled DNF module-streams correctly during the upgrade
-- Fix the leapp rerun command when upgrading using LiveMode
-- Ignore trailing slashes when checking that required mountpoints are persistent
-- Wait until filesystems defined in FSTAB are initialized and mounted when booting into the upgrade environment
-- Drop inhibitor for use of LiveMode on aarch64, s390x, ppcle64 architectures
-- LiveMode: Do not install RPMs that are not essential in the initramfs by default
-- Added scan and checks for NVMe devices, inhibiting upgrades on known problematic setups
-- Handle the upgrade on systems with NVMe-FC storage
-- Migrate the UEFI configuration when converting to RHEL
-- Inhibit the upgrade when converting system to a different linux distribution with enabled Secure Boot
-- Resolves: RHEL-128267, RHEL-95215, RHEL-102361, RHEL-46807, RHEL-100961, RHEL-42609, RHEL-33661, RHEL-19249, RHEL-119516
-
-* Wed Dec 17 2025 Matej Matuska <mmatuska@redhat.com> - 0.23.0-3
-- Fix handling of LVM and Multipath during the upgrade
-- Fix remediation command for making symlinks in root directory relative
-- Remove RPM GPG keys of the source distribution when upgrading and converting the system
-- Replace distro specific packages during upgrade and conversion
-- Improve error message when scanning invalid SSHD configuration
-- Update the leapp data files
-- Minor changes in logs and reports
-- Resolves: RHEL-14712, RHEL-30447, RHEL-19247, RHEL-127066, RHEL-124923, RHEL-119516
-
-* Thu Nov 13 2025 Karolina Kula <kkula@redhat.com> - 0.23.0-2
-- Requires leapp-framework 6.2+
-- Detect potentially harmful third party python modules for the target python version
-- Fix detection of encrypted Ceph OSD containers
-- Fix unlocking of LUKS devices when applied on non-rootfs file systems
-- Inhibit the upgrade if pluginpath is configured explicitly in DNF
-- Introduce `--target-os` option to specify target distribution for possible conversion during the upgrade
-- Introduce the `--target-version` alias for the `--target` option
-- Minor changes in logs and reports
-- Modernize the storage initialization when booting to the upgrade environment
-- Prevent sssdupdate actor from rising errors that could stop the upgrade
-- Respect repomapping on CentOS-like distributions
-- Respect repomapping when converting the system to different Linux distribution
-- Skip empty lines when parsing dumped DNF config to prevent confusing warning log
-- Cover JBoss EAP repositories for the upgrade
-- Update the leapp data files
-- Resolves: RHEL-25838, RHEL-35446, RHEL-69601, RHEL-71882, RHEL-90098, RHEL-120328, RHEL-123886
+* Fri Sep 12 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.23.0-1.elevate.1
+- ELevate vendors support for upstream 0.23.0-1 version (dcf53c28ea9c3fdd03277abcdeb1d124660f7f8e)
 
 * Thu Aug 14 2025 Karolina Kula <kkula@redhat.com> - 0.23.0-1
 - Rebase to new upstream 0.23.0
@@ -1282,4 +1191,3 @@ fi
 * Wed Nov 07 2018 Petr Stodulka <pstodulk@redhat.com> - 0.3-1
 - Initial RPM
   Resolves: #1636481
-