From 08fac19597ec9700df860993147bc9fa32d33001 Mon Sep 17 00:00:00 2001
From: Sandro Bonazzola <sbonazzo@redhat.com>
Date: Thu, 11 Jan 2024 08:53:03 +0100
Subject: [PATCH] Update to 4.6.1

Resolves: fedora#2257777
Resolves: fedora#2244214
---
 .gitignore |  1 +
 sos.spec   | 11 ++++++++++-
 sources    |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4060b3f..39aa96d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ sos-2.2.tar.gz
 /4.5.5.tar.gz
 /4.5.6.tar.gz
 /4.6.0.tar.gz
+/4.6.1.tar.gz
diff --git a/sos.spec b/sos.spec
index cb0d5d8..3373e39 100644
--- a/sos.spec
+++ b/sos.spec
@@ -1,6 +1,6 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 4.6.0
+Version: 4.6.1
 Release: 1%{?dist}
 Source0: https://github.com/sosreport/sos/archive/%{version}.tar.gz
 License: GPL-2.0-or-later
@@ -10,7 +10,11 @@ BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 Requires: python3-rpm
 Requires: python3-pexpect
+%if 0%{?rhel} && 0%{?rhel} < 10
 Requires: python3-setuptools
+%else
+Requires: python3-packaging
+%endif
 Recommends: python3-magic
 # Mandatory just for uploading to a SFTP server:
 Recommends: python3-requests
@@ -86,6 +90,11 @@ rm -rf %{buildroot}/usr/config/
 %config(noreplace) %{_sysconfdir}/sos/sos.conf
 
 %changelog
+* Thu Jan 11 2024 Sandro Bonazzola <sbonazzo@redhat.com> - 4.6.1-1
+- Update to 4.6.1
+- Resolves: fedora#2257777
+- Resolves: fedora#2244214
+
 * Mon Aug 21 2023 Sandro Bonazzola <sbonazzo@redhat.com> - 4.6.0-1
 - Update to 4.6.0
 - Resolves: fedora#2232710
diff --git a/sources b/sources
index de30d6b..ff6300d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (4.6.0.tar.gz) = 55bf85135833969aed78ba69a24737de6d4d687bbeb94a763e663855ab21b4563d222e2b85c5bcbe1b0553e110c2134c486e0d3eef49527be49be293baa45630
+SHA512 (4.6.1.tar.gz) = 8c5b99f94771a7938e7a5fca76f144c7629eb573c843fef0377cbb2b1f0f1be9602c88286e7c17f5cc03243ef915d63f3c3ffafc6987035576018223769c88ec