config.yaml

@@ -8,13 +8,9 @@ actions:
       - name: "Eduard Abdullin"
         email: "eabdullin@almalinux.org"
         line:
-          - "Add x86_64_v2 to _BASEARCH_MAP"
+          - "Added patch for almalinux bugtracker"
-          - "Add link to AlmaLinux bugtracker"
 
   - add_files:
       - type: "patch"
-        name: "0001-Add-link-to-AlmaLinux-bugtracker.patch"
+        name: "almalinux_bugtracker.patch"
-        number: 1001
+        number: 10000
-      - type: "patch"
-        name: "0001-Add-x86_64_v2-to-_BASEARCH_MAP.patch"
-        number: "Latest"

files/0001-Add-link-to-AlmaLinux-bugtracker.patch

@@ -1,49 +0,0 @@
-From 9e499fe783a6d7ac06b1f79b3610d2289804ec9c Mon Sep 17 00:00:00 2001
-From: eabdullin <ed.abdullin.1@gmail.com>
-Date: Thu, 1 Aug 2024 15:07:45 +0300
-Subject: [PATCH] Add link to AlmaLinux bugtracker
-
----
- dnf/const.py.in      | 2 +-
- doc/conf.py.in       | 2 +-
- tests/test_config.py | 3 +--
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/dnf/const.py.in b/dnf/const.py.in
-index bcadc80..4450507 100644
---- a/dnf/const.py.in
-+++ b/dnf/const.py.in
-@@ -54,4 +54,4 @@ VERSION='@DNF_VERSION@'
- 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 --git a/doc/conf.py.in b/doc/conf.py.in
-index 368efe3..ba5649b 100644
---- a/doc/conf.py.in
-+++ b/doc/conf.py.in
-@@ -267,5 +267,5 @@ rst_prolog = """
- .. _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 --git a/tests/test_config.py b/tests/test_config.py
-index d850267..cdc4934 100644
---- a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -55,8 +55,7 @@ class ConfTest(tests.support.TestCase):
-     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()
--- 
-2.39.3 (Apple Git-146)
-

files/0001-Add-x86_64_v2-to-_BASEARCH_MAP.patch

@@ -1,23 +0,0 @@
-From 6d8db37e0f3bca78effadcdaa235914fc2970ec8 Mon Sep 17 00:00:00 2001
-From: soksanichenko <soksanichenko@almalinux.org>
-Date: Thu, 12 Sep 2024 11:26:56 +0300
-Subject: [PATCH] Add x86_64_v2 to _BASEARCH_MAP
-
----
- dnf/rpm/__init__.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dnf/rpm/__init__.py b/dnf/rpm/__init__.py
-index 12efca7..69a77c8 100644
---- a/dnf/rpm/__init__.py
-+++ b/dnf/rpm/__init__.py
-@@ -112,6 +112,7 @@ _BASEARCH_MAP = _invert({
-     'sparc': ('sparc', 'sparc64', 'sparc64v', 'sparcv8', 'sparcv9',
-               'sparcv9v'),
-     'x86_64': ('x86_64', 'amd64', 'ia32e'),
-+    'x86_64_v2': ('x86_64_v2',),
- })
- 
- 
--- 
-2.39.3 (Apple Git-146)

files/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()