From 385c4f2abae810a33832f11c39e1c27dfb52b4de Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 18 May 2022 14:10:59 +0300 Subject: [PATCH] AlmaLinux changes --- SOURCES/sos-almalinux-branding.patch | 35 ++++++++++++++++++++++++++++ SPECS/sos.spec | 11 ++++++++- 2 files changed, 45 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 e468c18..fdf6a33 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: 15%{?dist} +Release: 15%{?dist}.alma Group: Applications/System Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz Source1: sos-audit-%{auditversion}.tgz @@ -48,6 +48,9 @@ Patch21: sos-bz2043488-ovn-proper-package-enablement.patch Patch22: sos-bz2054883-plugopt-logging-effective-opts.patch Patch23: sos-bz2055548-honour-plugins-timeout-hardcoded.patch +# 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 @@ -81,6 +84,9 @@ support technicians and developers. %patch22 -p1 %patch23 -p1 +# AlmaLinux patches +%patch1000 -p1 + %build %py3_build @@ -147,6 +153,9 @@ of the system. Currently storage and filesystem commands are audited. %changelog +* Wed May 18 2022 Eduard Abdullin - 4.2-15.alma +- Debrand for AlmaLinux + * Wed Feb 23 2022 Pavel Moravec = 4.2-15 - [sosnode] Handle downstream versioning for runtime option Resolves: bz2037350