.gitignore

@@ -1 +1,2 @@
 SOURCES/dnf-4.7.0.tar.gz
+/dnf-4.7.0.tar.gz

SOURCES/almalinux_bugtracker.patch

@@ -1,32 +0,0 @@
-diff -aruN dnf-4.7.0/dnf/const.py.in dnf-4.7.0_alma/dnf/const.py.in
---- dnf-4.7.0/dnf/const.py.in	2021-04-12 18:26:33.000000000 +0300
-+++ dnf-4.7.0_alma/dnf/const.py.in	2021-12-30 10:30:33.806575400 +0300
-@@ -55,4 +55,4 @@
- USER_AGENT = "dnf/%s" % VERSION
- 
- BUGTRACKER_COMPONENT=NAME.lower()
--BUGTRACKER='https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%s' % BUGTRACKER_COMPONENT
-+BUGTRACKER='https://bugs.almalinux.org/'
-diff -aruN dnf-4.7.0/doc/conf.py.in dnf-4.7.0_alma/doc/conf.py.in
---- dnf-4.7.0/doc/conf.py.in	2021-04-12 18:26:33.000000000 +0300
-+++ dnf-4.7.0_alma/doc/conf.py.in	2021-12-30 10:34:07.810855800 +0300
-@@ -267,5 +267,5 @@
- .. _DNF: https://github.com/rpm-software-management/dnf/
- .. _hawkey: http://rpm-software-management.github.io/hawkey/
- .. _YUM: http://yum.baseurl.org/
--.. _bugzilla: https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=dnf
-+.. _bugzilla: https://bugs.almalinux.org/
- """
-diff -aruN dnf-4.7.0/tests/test_config.py dnf-4.7.0_alma/tests/test_config.py
---- dnf-4.7.0/tests/test_config.py	2021-04-12 18:26:33.000000000 +0300
-+++ dnf-4.7.0_alma/tests/test_config.py	2021-12-30 10:33:24.147815500 +0300
-@@ -55,8 +55,7 @@
-     def test_bugtracker(self):
-         conf = Conf()
-         self.assertEqual(conf.bugtracker_url,
--                         "https://bugzilla.redhat.com/enter_bug.cgi" +
--                         "?product=Fedora&component=dnf")
-+                         "https://bugs.almalinux.org/")
- 
-     def test_conf_from_file(self):
-         conf = Conf()

dnf.spec

@@ -66,7 +66,7 @@ It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
 Version:        4.7.0
-Release:        20%{?dist}.alma
+Release:        20%{?dist}
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING
 License:        GPLv2+
@@ -125,9 +125,6 @@ Patch0046:      0046-RHEL-6393-Fix-japanese-translations.patch
 Patch0047:      0047-RHEL-11786-Fix-substitution-in-kvp-in-add_new_repo.patch
 
 
-#Almalinux patches
-Patch10000:     almalinux_bugtracker.patch
-
 BuildArch:      noarch
 BuildRequires:  cmake
 BuildRequires:  gettext
@@ -426,15 +423,14 @@ popd
 %{python3_sitelib}/%{name}/automatic/
 
 %changelog
-* Wed Mar 27 2024 Eduard Abdullin <eabdullin@almalinux.org> - 4.7.0-20.alma
-- AlmaLinux changes
-
 * Mon Oct 16 2023 Jaroslav Rohel <jrohel@redhat.com> - 4.7.0-20
 - Remove /usr/bin from sys.path to avoid accidentally importing garbage (RHEL-1245)
 - Fix japanese translations (RHEL-6393)
 - Fix substitution in kay-value-pair list in add_new_repo (RHEL-11786)
+
 * Wed Jun 28 2023 Jaroslav Rohel <jrohel@redhat.com> - 4.7.0-19
 - Document symbols in `dnf history list` output (RhBug:2172067)
+
 * Wed May 31 2023 Nicola Sella <nsella@redhat.com> - 4.7.0-18
 - Return an error when transaction fails (RhBug:2170093)
 
@@ -448,6 +444,7 @@ popd
 * Thu Jan 05 2023 Nicola Sella <nsella@redhat.com> - 4.7.0-15
 - Ignore processing variable files with unsupported encoding (RhBug:2141215)
 - Better explain traceback of rpm.error with dnf
+
 * Wed Nov 30 2022 Nicola Sella <nsella@redhat.com> - 4.7.0-14
 - Document changes to offline-upgrade command (RhBug:1939975,2139324)
 

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.ci-dnf-stack-gating.functional}

sources

@@ -0,0 +1 @@
+SHA512 (dnf-4.7.0.tar.gz) = 40bb6371986314ac1e6ef3eb2896a43cab560da850b3ecb37c9cf84143ff8ec6c6f1ee94f1d2bddd31d5399d5672f22828c678c766107d9ab3fd18e2f07232fa