From a25fa0d4183d3950d06e309a682095a7629c2396 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <sergey.cherevko@softline.com>
Date: Wed, 18 Dec 2024 21:27:12 +0300
Subject: [PATCH] Changed bug tracker URL to https://bugs.msvsphere-os.ru/ and
 Enable fastestmirror by default

---
 SOURCES/0001-msvsphere-bugtracker.patch       | 49 +++++++++++++++++++
 ...07-Set-fastestmirror-True-by-default.patch | 33 +++++++++++++
 SPECS/dnf.spec                                | 10 +++-
 3 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0001-msvsphere-bugtracker.patch
 create mode 100644 SOURCES/0007-Set-fastestmirror-True-by-default.patch

diff --git a/SOURCES/0001-msvsphere-bugtracker.patch b/SOURCES/0001-msvsphere-bugtracker.patch
new file mode 100644
index 0000000..cc20681
--- /dev/null
+++ b/SOURCES/0001-msvsphere-bugtracker.patch
@@ -0,0 +1,49 @@
+From 6dda2226b3c95120ced82ceab862846f52c051f4 Mon Sep 17 00:00:00 2001
+From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
+Date: Wed, 18 Dec 2024 21:18:29 +0300
+Subject: [PATCH] msvsphere 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..0e4d43c 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.msvsphere-os.ru/'
+diff --git a/doc/conf.py.in b/doc/conf.py.in
+index 368efe3..5a250b7 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.msvsphere-os.ru/
+ """
+diff --git a/tests/test_config.py b/tests/test_config.py
+index d850267..4f5c781 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.msvsphere-os.ru/")
+ 
+     def test_conf_from_file(self):
+         conf = Conf()
+-- 
+2.43.5
+
diff --git a/SOURCES/0007-Set-fastestmirror-True-by-default.patch b/SOURCES/0007-Set-fastestmirror-True-by-default.patch
new file mode 100644
index 0000000..8bfafd0
--- /dev/null
+++ b/SOURCES/0007-Set-fastestmirror-True-by-default.patch
@@ -0,0 +1,33 @@
+From 98e0b5658215116761cf2f56d312a8d2871b00a7 Mon Sep 17 00:00:00 2001
+From: tigro <arkadiy.sheyn@softline.com>
+Date: Tue, 29 Aug 2023 13:32:05 +0300
+Subject: [PATCH] Set fastestmirror=True by default
+
+---
+ etc/dnf/dnf-strict.conf | 1 +
+ etc/dnf/dnf.conf        | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/etc/dnf/dnf-strict.conf b/etc/dnf/dnf-strict.conf
+index 3d08d07..ebaf324 100644
+--- a/etc/dnf/dnf-strict.conf
++++ b/etc/dnf/dnf-strict.conf
+@@ -3,4 +3,5 @@ gpgcheck=1
+ installonly_limit=3
+ clean_requirements_on_remove=True
+ best=True
++fastestmirror=True
+ skip_if_unavailable=False
+diff --git a/etc/dnf/dnf.conf b/etc/dnf/dnf.conf
+index bc665d2..043005d 100644
+--- a/etc/dnf/dnf.conf
++++ b/etc/dnf/dnf.conf
+@@ -5,4 +5,5 @@ gpgcheck=True
+ installonly_limit=3
+ clean_requirements_on_remove=True
+ best=False
++fastestmirror=True
+ skip_if_unavailable=True
+-- 
+2.41.0
+
diff --git a/SPECS/dnf.spec b/SPECS/dnf.spec
index f29eb06..cd41c5e 100644
--- a/SPECS/dnf.spec
+++ b/SPECS/dnf.spec
@@ -68,7 +68,7 @@ It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
 Version:        4.20.0
-Release:        6%{?dist}
+Release:        6%{?dist}.inferit
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING
 License:        GPL-2.0-or-later AND GPL-1.0-only
@@ -79,6 +79,10 @@ Patch2:         0002-Limit-queries-to-nevra-forms-when-provided-by-comman.patch
 Patch3:         0003-doc-Remove-provide-of-spec-definition-for-repoquery-.patch
 Patch4:         0004-Drop-collect-file-for-ABRT.patch
 Patch5:         0005-tests-Use-PGP-keys-without-SHA-1.patch
+# MSVSphere
+Patch100:       0001-msvsphere-bugtracker.patch
+Patch101:       0007-Set-fastestmirror-True-by-default.patch
+
 BuildArch:      noarch
 BuildRequires:  cmake
 BuildRequires:  gettext
@@ -419,6 +423,10 @@ popd
 %{python3_sitelib}/%{name}/automatic/
 
 %changelog
+* Wed Dec 18 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 4.20.0-6.inferit
+- Changed bug tracker URL to https://bugs.msvsphere-os.ru/ 
+- Enable fastestmirror by default (by Arkady L. Shane <tigro@msvsphere-os.ru)
+
 * Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.20.0-6
 - Rebuilt for MSVSphere 10