From 7ad9001b8e9035d1bda6c151dd739873a6227e01 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 18 May 2022 13:12:35 +0300 Subject: [PATCH] AlmaLinux changes --- SOURCES/almalinux_bugtracker.patch | 32 ++++++++++++++++++++++++++++++ SPECS/dnf.spec | 8 +++++++- 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..9aebb2e --- /dev/null +++ b/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() diff --git a/SPECS/dnf.spec b/SPECS/dnf.spec index 9bafd9f..9460f39 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.10.0 -Release: 5%{?dist} +Release: 5%{?dist}.alma Summary: %{pkg_summary} # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2+ @@ -78,6 +78,9 @@ Patch3: 0003-Documentation-API-notes-for-cacheonly.patch Patch4: 0004-Use-rpm.TransactionSet.dbCookie-to-determining-if-rp.patch Patch5: 0005-Update-translations-RhBug-2017347.patch +#Almalinux patches +Patch10000: almalinux_bugtracker.patch + BuildArch: noarch BuildRequires: cmake BuildRequires: gettext @@ -375,6 +378,9 @@ popd %{python3_sitelib}/%{name}/automatic/ %changelog +* Wed May 18 2022 Eduard Abdullin - 4.10.0-5.alma +- Added patch for almalinux bugtracker + * Mon Mar 21 2022 Marek Blaha - 4.10.0-5 - Update translations