commit bcdc9de254f833cdec7f50619ab32ec217623b18 Author: Sofia Boldyreva Date: Wed Jan 15 21:02:55 2025 +0100 Initial commit diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..d123eb6 --- /dev/null +++ b/config.yaml @@ -0,0 +1,20 @@ +actions: + + - modify_release: + - suffix: ".alma.1" + enabled: true + + - changelog_entry: + - name: "Eduard Abdullin" + email: "eabdullin@almalinux.org" + line: + - "Add x86_64_v2 to _BASEARCH_MAP" + - "Add link to AlmaLinux bugtracker" + + - add_files: + - type: "patch" + name: "0001-Add-link-to-AlmaLinux-bugtracker.patch" + number: 1001 + - type: "patch" + name: "0001-Add-x86_64_v2-to-_BASEARCH_MAP.patch" + number: "Latest" diff --git a/files/0001-Add-link-to-AlmaLinux-bugtracker.patch b/files/0001-Add-link-to-AlmaLinux-bugtracker.patch new file mode 100644 index 0000000..22955d4 --- /dev/null +++ b/files/0001-Add-link-to-AlmaLinux-bugtracker.patch @@ -0,0 +1,49 @@ +From 9e499fe783a6d7ac06b1f79b3610d2289804ec9c Mon Sep 17 00:00:00 2001 +From: eabdullin +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) + diff --git a/files/0001-Add-x86_64_v2-to-_BASEARCH_MAP.patch b/files/0001-Add-x86_64_v2-to-_BASEARCH_MAP.patch new file mode 100644 index 0000000..2fefb1a --- /dev/null +++ b/files/0001-Add-x86_64_v2-to-_BASEARCH_MAP.patch @@ -0,0 +1,23 @@ +From 6d8db37e0f3bca78effadcdaa235914fc2970ec8 Mon Sep 17 00:00:00 2001 +From: soksanichenko +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)