From 3293c5daad4c55afe194b6bbde6fc845aa4957dd Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 19 Jan 2022 13:06:21 +0300 Subject: [PATCH] AlmaLinux changes --- SOURCES/sos-almalinux-branding.patch | 35 ++++++++++++++++++++++++++++ SPECS/sos.spec | 9 ++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 SOURCES/sos-almalinux-branding.patch diff --git a/SOURCES/sos-almalinux-branding.patch b/SOURCES/sos-almalinux-branding.patch new file mode 100644 index 0000000..8101777 --- /dev/null +++ b/SOURCES/sos-almalinux-branding.patch @@ -0,0 +1,35 @@ +diff -Naur sos-4.1/sos/policies/distros/redhat.py sos-4.1.alma/sos/policies/distros/redhat.py +--- sos-4.1/sos/policies/distros/redhat.py 2021-02-25 21:46:49.000000000 +0300 ++++ sos-4.1.alma/sos/policies/distros/redhat.py 2021-10-09 22:26:17.000000000 +0300 +@@ -365,6 +365,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 RedHatAtomicPolicy(RHELPolicy): + distro = "Red Hat Atomic Host" + msg = _("""\ +@@ -493,6 +502,15 @@ + vendor_urls = [('Community Website', 'https://www.centos.org/')] + + ++class AlmaLinuxAtomicPolicy(RedHatAtomicPolicy): ++ distro = "AlmaLinux Atomic Host" ++ vendor = "AlmaLinux OS Foundation" ++ vendor_urls = [ ++ ('Distribution Website', 'https://www.almalinux.org/'), ++ ('Commercial Support', 'https://tuxcare.com/linux-support-services/') ++ ] ++ ++ + class FedoraPolicy(RedHatPolicy): + + distro = "Fedora" diff --git a/SPECS/sos.spec b/SPECS/sos.spec index b1cd45d..4724e52 100644 --- a/SPECS/sos.spec +++ b/SPECS/sos.spec @@ -5,7 +5,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 4.2 -Release: 8%{?dist} +Release: 8%{?dist}.alma Group: Applications/System Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz Source1: sos-audit-%{auditversion}.tgz @@ -41,6 +41,8 @@ Patch14: sos-bz2024893-cleaner-hostnames-improvements.patch Patch15: sos-bz2025611-RHTS-api-change.patch Patch16: sos-bz2034001-nvidia-GPU-info.patch Patch17: sos-bz2031777-rhui-logs.patch +# almalinux +Patch1000: sos-almalinux-branding.patch %description Sos is a set of tools that gathers information about system @@ -68,6 +70,8 @@ support technicians and developers. %patch15 -p1 %patch16 -p1 %patch17 -p1 +# almalinux +%patch1000 -p1 %build %py3_build @@ -135,6 +139,9 @@ of the system. Currently storage and filesystem commands are audited. %changelog +* Wed Jan 19 2022 Eduard Abdullin - 4.2-8.alma +- Debrand for AlmaLinux + * Sun Dec 19 2021 Pavel Moravec = 4.2-8 - [rhui] New log folder Resolves: bz2031777