Merge branch 'c8' into a8

SOURCES/sos-almalinux-branding.patch

@@ -0,0 +1,19 @@
+diff -aruN sos-4.7.0/sos/policies/distros/redhat.py sos-4.7.0.alma/sos/policies/distros/redhat.py
+--- sos-4.7.0/sos/policies/distros/redhat.py	2024-02-20 03:39:46
++++ sos-4.7.0.alma/sos/policies/distros/redhat.py	2024-04-10 08:58:53
+@@ -495,6 +495,15 @@
+     vendor_urls = [('Community Website', 'https://www.centos.org/')]
+ 
+ 
++class AlmaLinuxPolicy(RHELPolicy):
++    distro = "AlmaLinux"
++    vendor = "AlmaLinux OS Foundation"
++    vendor_urls = [
++        ('Distribution Website', 'https://www.almalinux.org/'),
++        ('Commercial Support', 'https://tuxcare.com/linux-support-services/')
++    ]
++
++
+ class RedHatCoreOSPolicy(RHELPolicy):
+     """
+     Red Hat CoreOS is a containerized host built upon Red Hat Enterprise Linux

SPECS/sos.spec

@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 4.7.0
-Release: 1%{?dist}
+Release: 1%{?dist}.alma.1
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -23,6 +23,9 @@ Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
 Obsoletes: sos-collector
 
+# AlmaLinux patches
+Patch1000: sos-almalinux-branding.patch
+
 %description
 Sos is a set of tools that gathers information about system
 hardware and configuration. The information can then be used for
@@ -33,9 +36,11 @@ support technicians and developers.
 %setup -qn %{name}-%{version}
 %setup -T -D -a1 -q
 
+# AlmaLinux patches
+%patch1000 -p1
 
 %build
-%py3_build         
+%py3_build
 
 %install
 %py3_install '--install-scripts=%{_sbindir}'
@@ -105,6 +110,9 @@ of the system. Currently storage and filesystem commands are audited.
 %ghost /etc/audit/rules.d/40-sos-storage.rules
 
 %changelog
+* Wed Apr 10 2024 Eduard Abdullin <eabdullin@almalinux.org> - 4.7.0-1.alma.1
+- Debrand for AlmaLinux
+
 * Tue Feb 20 2024 Jan Jansky <jjansky@redhat.com> = 4.7.0-1
 - rebase to upstream 4.7.0
   Resolves: RHEL-26111
@@ -134,13 +142,11 @@ of the system. Currently storage and filesystem commands are audited.
 * Thu Jul 27 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.6-1
 - Rebase sos to 4.5.6
   Resolves: bz2226724
-
 * Fri Jul 14 2023 Jan Jansky <jjansky@redhat.com> = 4.5.5-2
 - Adding patch for mac obfuscation
   Resolves: bz2218279
   Resolves: bz2216608
   Resolves: bz2207562
-
 * Mon Jul 03 2023 Jan Jansky <jjansky@redhat.com> = 4.5.5-1
 - [clean] Respect permissions of sanitised files
   Resolves: bz2218279
@@ -166,7 +172,6 @@ of the system. Currently storage and filesystem commands are audited.
   Resolves: bz2177282
 - [virsh] Scrub passwords in virt-manager logs
   Resolves: bz2184062
-
 * Wed Mar 08 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.1-3
 - Rebase on upstream 4.5.1
   Resolves: bz2175806
@@ -178,7 +183,6 @@ of the system. Currently storage and filesystem commands are audited.
   Resolves: bz2176086
 - [cleaner] dont clean sys_tmp from final_path
   Resolves: bz2176218
-
 * Tue Feb 07 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.0-1
 - Rebase on upstream 4.5.0
   Resolves: bz2082614