!37 update to 4.4

From: @dillon_chen 
Reviewed-by: @overweight 
Signed-off-by: @overweight

backport-Fix-dict-order-py38-incompatibility.patch

@@ -1,34 +0,0 @@
-From 1d7bab6c7ce3f78758113ca3cdf3e9fa1762df24 Mon Sep 17 00:00:00 2001
-From: Eric Desrochers <eric.desrochers@canonical.com>
-Date: Wed, 19 Aug 2020 17:44:07 -0400
-Subject: [PATCH] [options] Fix dict order py38 incompatibility
-
-python-3.8 dict changes introduce a traceback during our config file
-parsing for options with `-` characters in them.
-
-Fix this by changing an iteration of the dict keys from `dict.keys()`
-that returns a dict_keys view, to `list(dict)` which returns a list copy
-of the keys.
-
-Closes: #2206
-Resolves: #2207
-
-Signed-off-by: Eric Desrochers <eric.desrochers@canonical.com>
-Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
----
- sos/options.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sos/options.py b/sos/options.py
-index 3a2b4292f..ba3db1303 100644
---- a/sos/options.py
-+++ b/sos/options.py
-@@ -186,7 +186,7 @@ def _update_from_section(section, config):
-                 if 'verbose' in odict.keys():
-                     odict['verbosity'] = int(odict.pop('verbose'))
-                 # convert options names
--                for key in odict.keys():
-+                for key in list(odict):
-                     if '-' in key:
-                         odict[key.replace('-', '_')] = odict.pop(key)
-                 # set the values according to the config file

sos.spec

@@ -1,21 +1,22 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:          sos
-Version:       4.0
-Release:       6
+Version:       4.4
+Release:       1
 Summary:       A set of tools to gather troubleshooting information from a system
 License:       GPLv2+
 URL:           https://github.com/sosreport/sos
 Source0:       https://github.com/sosreport/sos/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-Patch6000:     backport-Fix-dict-order-py38-incompatibility.patch
 Patch9000:     openEuler-add-openEuler-policy.patch
 Patch9001:     add-uniontech-os-support.patch
 Patch9002:     Fix-sos-command-failed-in-sos-4.0.patch
 Patch9003:     add-KylinSec-OS-support.patch
 
 BuildRequires: python3-devel gettext
-Requires:      libxml2-python3 bzip2 xz python3-rpm tar python3-pexpect
+Requires:      bzip2 xz python3-rpm tar python3-pexpect
+Requires:      python3-magic
+Recommends:    python3-pyyaml
 BuildArch:     noarch
 
 %description
@@ -40,6 +41,8 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/groups.d
 install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/extras.d
 install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
 
+rm -rf ${RPM_BUILD_ROOT}/usr/config/
+
 %find_lang %{name} || echo 0
 
 %files -f %{name}.lang
@@ -61,6 +64,9 @@ install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
 %{_mandir}/man5/*
 
 %changelog
+* Sun Oct  9 2022 dillon chen < dillon.chen@gmail.com> - 4.4-1
+- update to 4.4
+
 * Wed Feb 23 2022 liuxingxiang <liuxingxiang@kylinsec.com.cn> - 4.0-6
 - add KylinSec policy
 
@@ -73,7 +79,7 @@ install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
 * Mon Mar 08 2021 shixuantong <shixuantong@huawei.com> - 4.0-3
 - add openEuler policy
 
-* Tue Mar 03 2021 shixuantong <shixuantong@huawei.com> - 4.0-2
+* Wed Mar 03 2021 shixuantong <shixuantong@huawei.com> - 4.0-2
 - fix unable to read configure file /etc/sos/sos.conf issue
 
 * Tue Feb 02 2021 shixuantong <shixuantong@huawei.com> - 4.0-1