Compare commits

..

7 Commits
c8 ... a8

Author SHA1 Message Date
Eduard Abdullin
3e8003b26f Added patch for almalinux bugtracker 2025-03-11 09:33:23 +00:00
eabdullin
c6b5e62ad0 Merge branch 'c8' into a8 2023-05-16 07:34:46 +00:00
eabdullin
dcf551790f Merge branch 'c8' into a8 2022-11-08 06:59:04 +00:00
4a8e4080ec Fix changelog 2022-05-10 18:51:18 +03:00
eabdullin
6ec8b095d2 Merge branch 'c8' into a8 2022-05-10 10:05:13 +00:00
eabdullin
65557f35a5 Fix almalinux patch 2022-01-19 16:57:59 +03:00
eabdullin
787eec71f9 Added patch for almalinux bugtracker 2021-12-30 12:01:07 +03:00
2 changed files with 39 additions and 1 deletions

View File

@ -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()

View File

@ -66,7 +66,7 @@ It supports RPMs, modules and comps groups & environments.
Name: dnf Name: dnf
Version: 4.7.0 Version: 4.7.0
Release: 21%{?dist} Release: 21%{?dist}.alma.1
Summary: %{pkg_summary} Summary: %{pkg_summary}
# For a breakdown of the licensing, see PACKAGE-LICENSING # For a breakdown of the licensing, see PACKAGE-LICENSING
License: GPLv2+ License: GPLv2+
@ -127,6 +127,9 @@ Patch0048: 0048-smtplib-catch-OSError-not-SMTPException.patch
Patch0049: 0049-automatic-Check-availability-of-config-file.patch Patch0049: 0049-automatic-Check-availability-of-config-file.patch
Patch0050: 0050-Fix-missing-import-in-automatic.patch Patch0050: 0050-Fix-missing-import-in-automatic.patch
# AlmaLinux Patch
Patch10000: almalinux_bugtracker.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: cmake BuildRequires: cmake
@ -426,6 +429,9 @@ popd
%{python3_sitelib}/%{name}/automatic/ %{python3_sitelib}/%{name}/automatic/
%changelog %changelog
* Tue Mar 11 2025 Eduard Abdullin <eabdullin@almalinux.org> - 4.7.0-21.alma.1
- Added patch for almalinux bugtracker
* Wed Jan 29 2025 Marek Blaha <mblaha@redhat.com> - 4.7.0-21 * Wed Jan 29 2025 Marek Blaha <mblaha@redhat.com> - 4.7.0-21
- automatic: catch OSError, not SMTPException on smtp errors (RHEL-71545) - automatic: catch OSError, not SMTPException on smtp errors (RHEL-71545)
- automatic: Check availability of config file (RHEL-71545) - automatic: Check availability of config file (RHEL-71545)