Merge branch 'c8' into a8

SOURCES/almalinux_bugtracker.patch

@@ -0,0 +1,32 @@
+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()

SPECS/dnf.spec

@@ -66,7 +66,7 @@ It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
 Version:        4.7.0
-Release:        16%{?dist}
+Release:        16%{?dist}.alma
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING
 License:        GPLv2+
@@ -119,6 +119,10 @@ Patch0040:      0040-Update-translations.patch
 
 
 
+
+#Almalinux patches
+Patch10000:     almalinux_bugtracker.patch
+
 BuildArch:      noarch
 BuildRequires:  cmake
 BuildRequires:  gettext
@@ -417,9 +421,11 @@ popd
 %{python3_sitelib}/%{name}/automatic/
 
 %changelog
+* Tue May 16 2023 Eduard Abdullin <eabdullin@almalinux.org> - 4.7.0-16.alma
+- Added patch for almalinux bugtracker
+
 * Wed Mar 08 2023 Marek Blaha <mblaha@redhat.com> - 4.7.0-16
 - Update translations
-
 * 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