From 787eec71f9cd883c9693425ad04d1cecd5db0a55 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 30 Dec 2021 12:01:07 +0300 Subject: [PATCH] Added patch for almalinux bugtracker --- SOURCES/almalinux_bugtracker.patch | 31 ++++++++++++++++++++++++++++++ SPECS/dnf.spec | 9 ++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 SOURCES/almalinux_bugtracker.patch diff --git a/SOURCES/almalinux_bugtracker.patch b/SOURCES/almalinux_bugtracker.patch new file mode 100644 index 0000000..9b8c277 --- /dev/null +++ b/SOURCES/almalinux_bugtracker.patch @@ -0,0 +1,31 @@ +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 + """ +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() diff --git a/SPECS/dnf.spec b/SPECS/dnf.spec index f4a9d29..129b95f 100644 --- a/SPECS/dnf.spec +++ b/SPECS/dnf.spec @@ -66,7 +66,7 @@ It supports RPMs, modules and comps groups & environments. Name: dnf Version: 4.7.0 -Release: 4%{?dist} +Release: 4%{?dist}.alma Summary: %{pkg_summary} # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2+ @@ -79,6 +79,10 @@ Patch4: 0004-Use-rpmkeys-alone-to-verify-signature.patch Patch5: 0005-Lower-_pkgverify_level-to-signature-for-signature-checking-with-rpmkeys.patch Patch6: 0006-Update-translations.patch + +#Almalinux patches +Patch10000: almalinux_bugtracker.patch + BuildArch: noarch BuildRequires: cmake BuildRequires: gettext @@ -377,6 +381,9 @@ popd %{python3_sitelib}/%{name}/automatic/ %changelog +* Thu Dec 30 2021 Eduard Abdullin - 4.7.0-4.alma +- Added patch for almalinux bugtracker + * Mon Sep 13 2021 Marek Blaha - 4.7.0-4 - Update translations (RhBug:1961632)