SOURCES/0001-Add-MSVSphere-policy-implementation.patch

@@ -1,55 +0,0 @@
-From 962bdc46472a45c0dd0dacbf358fe78427346783 Mon Sep 17 00:00:00 2001
-From: Eugene Zamriy <eugene@zamriy.info>
-Date: Sat, 1 Apr 2023 00:38:19 +0300
-Subject: [PATCH] Add MSVSphere policy implementation
-
----
- sos/policies/distros/msvsphere.py | 36 +++++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
- create mode 100644 sos/policies/distros/msvsphere.py
-
-diff --git a/sos/policies/distros/msvsphere.py b/sos/policies/distros/msvsphere.py
-new file mode 100644
-index 0000000..12abf55
---- /dev/null
-+++ b/sos/policies/distros/msvsphere.py
-@@ -0,0 +1,36 @@
-+# Copyright (C) Eugene Zamriy <ezamriy@msvsphere.ru>
-+
-+# This file is part of the sos project: https://github.com/sosreport/sos
-+#
-+# This copyrighted material is made available to anyone wishing to use,
-+# modify, copy, or redistribute it subject to the terms and conditions of
-+# version 2 of the GNU General Public License.
-+#
-+# See the LICENSE file in the source distribution for further information.
-+
-+from sos.policies.distros.redhat import RedHatPolicy, OS_RELEASE
-+import os
-+
-+
-+class MSVSpherePolicy(RedHatPolicy):
-+
-+    distro = 'MSVSphere'
-+
-+    vendor = 'LLC "NCSD"'
-+
-+    vendor_urls = [
-+        ('Distribution Website', 'https://msvsphere-os.ru'),
-+        ('Vendor Website', 'http://ncpr.su/')
-+    ]
-+
-+    @classmethod
-+    def check(cls, remote=''):
-+        if remote:
-+            return cls.distro in remote
-+        elif not os.path.exists(OS_RELEASE):
-+            return False
-+        with open(OS_RELEASE, 'r') as fd:
-+            for line in fd:
-+                if line.startswith('NAME') and 'MSVSphere' in line:
-+                    return True
-+        return False
--- 
-2.39.2
-

SPECS/sos.spec

@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 4.8.1
-Release: 1%{?dist}.inferit
+Release: 1%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -23,9 +23,6 @@ Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
 Obsoletes: sos-collector <= 1.9
 
-# MSVSphere patches
-Patch1001: 0001-Add-MSVSphere-policy-implementation.patch
-
 %description
 Sos is a set of tools that gathers information about system
 hardware and configuration. The information can then be used for
@@ -35,7 +32,6 @@ support technicians and developers.
 %prep
 %setup -qn %{name}-%{version}
 %setup -T -D -a1 -q
-%patch1001 -p1
 
 %build
 %py3_build
@@ -152,10 +148,6 @@ of the system.  Currently storage and filesystem commands are audited.
 - rebase to upstream 4.7.0
   Resolves: RHEL-26115
 
-* Tue Feb 20 2024 Jan Jansky <jjansky@redhat.com> = 4.7.0-1
-- rebase to upstream 4.7.0
-  Resolves: RHEL-26115
-
 * Thu Jan 11 2024 Pavel Moravec <pmoravec@redhat.com> = 4.6.1-1
 - rebase to upstream 4.6.1
   Resolves: RHEL-21174
@@ -174,9 +166,6 @@ of the system.  Currently storage and filesystem commands are audited.
 - [greenboot] seperate logs to a standalone plugin; enhance [microshift]
   Resolves: SUPDEV148
 
-* Wed Sep 13 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 4.6.0-2.inferit
-- Change urls from msvsphere.ru to msvsphere-os.ru
-
 * Fri Sep 01 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-2
 - [openshift_ovn] Collect additional ovnkube node logs
   Resolves: SUPDEV145
@@ -201,7 +190,7 @@ of the system.  Currently storage and filesystem commands are audited.
 - Rebase on upstream 4.5.5
   Resolves: bz2217943
 
-* Wed May 31 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.4-1
+* Tue May 31 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.4-1
 - [specfile] add runtime requirement to python3-setuptools
   Resolves: bz2207776
 
@@ -213,9 +202,6 @@ of the system.  Currently storage and filesystem commands are audited.
 - [powerpc]: To collect lparnumascore logs
   Resolves: bz2177984
 
-* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 4.3-5
-- Rebuilt for MSVSphere 9.1.
-
 * Wed Mar 08 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.1-3
 - Rebase on upstream 4.5.1
   Resolves: bz2175808