Accepting request 1298844 from systemsmanagement

OBS-URL: https://build.opensuse.org/request/show/1298844
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ServiceReport?expand=0&rev=14

ServiceReport-2.2.4+git11.8bf0f05.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0137db59372a585b334be347a3f9ffd94c6521fd0fd6e073fc722494710b69af
+size 29040

ServiceReport.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Mon Aug 11 13:12:18 UTC 2025 - Michal Suchanek <msuchanek@suse.de>
+
+- Update to version 2.2.4+git11.8bf0f05:
+  * Remove PrivateDevices=true
+  * remove type=oneshot
+  * add new plugin Spyre card configuration
+
+-------------------------------------------------------------------
+Tue Jul 29 13:47:43 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Fix packaging to use proper Python related macros (bsc#1244547 ltc#213710)
+- Add fix_setup.patch to modernize upstream packaging
+  (gh#linux-ras/ServiceReport!32).
+
+-------------------------------------------------------------------
+Fri Jun 20 11:07:00 UTC 2025 - msuchanek@suse.de
+
+- Update to version 2.2.4+git4.cdcbdfa:
+  * [utils] update logic to parse /etc/os-release (bsc#1244547 ltc#213710)
+  * Added hardening to systemd service
+
+-------------------------------------------------------------------
+Fri Apr 18 15:47:35 UTC 2025 - msuchanek@suse.de
+
+- Update to version 2.2.4+git3.f65dad0:
+  * Added hardening to systemd service
+- Drop upstreamed patch harden_servicereport.service.patch
+
+-------------------------------------------------------------------
+Wed Oct 23 15:41:36 UTC 2024 - msuchanek@suse.de
+
+- Update to version 2.2.4+git2.f1e4503:
+  * [Service] Make the servicereport service dependent on the kdump service
+  * [utils] Use --update-bls-cmdline Option for GRUB Update
+- Refresh harden_servicereport.service.patch
+
 -------------------------------------------------------------------
 Tue Feb 27 14:56:44 UTC 2024 - msuchanek@suse.com
 

ServiceReport.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ServiceReport
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,25 +16,30 @@
 #
 
 
-%define libversion %(echo %{version} | sed -e "s/+git.*//")
+%define libversion %(echo %{version} | sed -e 's/\+git.*$//')
 
 # By default python 3 is used to build the package.
 %define python python3
 Name:           ServiceReport
-Version:        2.2.4+git0.f1a5383
+Version:        2.2.4+git11.8bf0f05
 Release:        0
 Summary:        A tool to validate and repair First Failure Data Capture (FFDC) configuration
 License:        GPL-2.0-only
 Group:          System/Management
 URL:            https://github.com/linux-ras/ServiceReport
 Source:         %{name}-%{version}.tar.xz
-Patch0:         harden_servicereport.service.patch
-BuildRequires:  %{python}
-BuildRequires:  %{python}-setuptools
+# PATCH-FIX-UPSTREAM fix_setup.patch gh#linux-ras/ServiceReport!32 mcepl@suse.com
+# Don't install data files and modernize Python package setup
+Patch0:         fix_setup.patch
+BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+BuildRequires:  python3
+BuildRequires:  python3-pip
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-wheel
 BuildRequires:  systemd-rpm-macros
-%systemd_requires
 BuildArch:      noarch
+%systemd_requires
 
 %description
 ServiceReport is a python based tool that investigates the incorrect
@@ -44,14 +49,18 @@ the incorrect configuration
 %define debug_package %{nil}
 
 %prep
-%setup -q
-%autopatch -p1
+%autosetup -p1
 
 %build
-%{python} setup.py build
+%python3_pyproject_wheel
 
 %install
-%{python} setup.py install --root=%{buildroot}
+%python3_pyproject_install
+install -D -m 644 man/servicereport.8 \
+    %{buildroot}%{_mandir}/man8/servicereport.8
+install -D -m 644 service/servicereport.service \
+    %{buildroot}%{_unitdir}/servicereport.service
+%fdupes %{buildroot}%{python3_sitelib}
 
 %pre
 %service_add_pre servicereport.service
@@ -67,17 +76,11 @@ the incorrect configuration
 
 %files
 %license COPYING
+%doc README.md
 %{_mandir}/man8/*
-%doc %{_datadir}/doc/*
 %{_bindir}/servicereport
 %{_unitdir}/servicereport.service
-
-%if "%{python}" == "python3"
 %{python3_sitelib}/servicereportpkg
-%{python3_sitelib}/%{name}-%{libversion}*.egg-info
-%else
-%{python_sitelib}/servicereportpkg
-%{python_sitelib}/%{name}-%{libversion}*.egg-info
-%endif
+%{python3_sitelib}/[Ss]ervice[Rr]eport-%{libversion}*-info
 
 %changelog

_service

@@ -1,5 +1,5 @@
 <services>
-  <service name="tar_scm" mode="disabled">
+  <service name="tar_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://github.com/linux-ras/ServiceReport</param>
     <param name="revision">master</param>
@@ -7,9 +7,9 @@
     <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service name="recompress" mode="disabled">
+  <service name="recompress" mode="manual">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
-  <service name="set_version" mode="disabled" />
+  <service name="set_version" mode="manual" />
 </services>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/linux-ras/ServiceReport</param>
-              <param name="changesrevision">f1a53833e4ece36b135391f5df7c81bc25d201dc</param></service></servicedata>
+              <param name="changesrevision">8bf0f051098a60bc48150493b401a846bfa6ba50</param></service></servicedata>

fix_setup.patch

@@ -0,0 +1,91 @@
+---
+ servicereport |   15 ---------------
+ setup.cfg     |   23 +++++++++++++++++------
+ setup.py      |   27 ++-------------------------
+ 3 files changed, 19 insertions(+), 46 deletions(-)
+
+Index: ServiceReport-2.2.4+git7.8ca0fe4/servicereport
+===================================================================
+--- ServiceReport-2.2.4+git7.8ca0fe4.orig/servicereport	2025-06-20 13:07:00.000000000 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,15 +0,0 @@
+-#!/usr/bin/env python3
+-
+-# SPDX-License-Identifier: GPL-2.0-only
+-#
+-# (C) Copyright IBM Corp. 2018, 2019
+-# Author: Sourabh Jain <sourabhjain@linux.ibm.com>
+-
+-"""Entry point script"""
+-
+-import sys
+-
+-from servicereportpkg import main
+-
+-if __name__ == "__main__":
+-    sys.exit(main())
+Index: ServiceReport-2.2.4+git7.8ca0fe4/setup.cfg
+===================================================================
+--- ServiceReport-2.2.4+git7.8ca0fe4.orig/setup.cfg	2025-06-20 13:07:00.000000000 +0200
++++ ServiceReport-2.2.4+git7.8ca0fe4/setup.cfg	2025-07-29 15:38:48.669844964 +0200
+@@ -3,10 +3,21 @@
+ # (C) Copyright IBM Corp. 2018, 2019
+ # Author: Sourabh Jain <sourabhjain@linux.ibm.com>
+ 
+-
+ [metadata]
+-name: ServiceReport
+-description: FFDC validation tool
+-long_description: Validation tool to verify First Failure Data Capture (FFDC) configurations
+-author: Sourabh Jain
+-author_email: sourabhjain@linux.ibm.com
++name = ServiceReport
++version = attr: servicereportpkg.get_version
++author = Sourabh Jain
++author_email = sourabhjain@linux.ibm.com
++description = FFDC validation tool
++long_description = file: README.md
++license = GPL-2.0-only
++classifiers =
++    Development Status :: 4 - Beta
++    Programming Language :: Python
++
++[options]
++packages = find:
++
++[options.entry_points]
++console_scripts =
++    servicereport = servicereportpkg:main
+Index: ServiceReport-2.2.4+git7.8ca0fe4/setup.py
+===================================================================
+--- ServiceReport-2.2.4+git7.8ca0fe4.orig/setup.py	2025-06-20 13:07:00.000000000 +0200
++++ ServiceReport-2.2.4+git7.8ca0fe4/setup.py	2025-07-29 15:38:48.669994876 +0200
+@@ -1,26 +1,3 @@
+-# SPDX-License-Identifier: GPL-2.0-only
+-#
+-# (C) Copyright IBM Corp. 2018, 2019
+-# Author: Sourabh Jain <sourabhjain@linux.ibm.com>
++from setuptools import setup
+ 
+-import os
+-import sys
+-from setuptools import setup, find_packages
+-
+-from servicereportpkg import get_version
+-
+-# Workaround for https://bugs.python.org/issue644744
+-if "bdist_rpm" in sys.argv[1:]:
+-    os.putenv("COMPRESS", " ")
+-
+-setup(packages=find_packages(),
+-      scripts=['servicereport'],
+-      version=get_version(),
+-      data_files=[('share/man/man8', ['man/servicereport.8']),
+-                  ('share/doc/ServiceReport', ['README.md']),
+-                  ('share/licenses/ServiceReport', ['COPYING']),
+-                  ('/usr/lib/systemd/system',
+-                   ['service/servicereport.service'])],
+-      classifiers=[
+-          'Development Status :: 4 - Beta',
+-          'Programming Language :: Python'])
++setup()

harden_servicereport.service.patch

@@ -1,22 +0,0 @@
-Index: ServiceReport-2.2.3/service/servicereport.service
-===================================================================
---- ServiceReport-2.2.3.orig/service/servicereport.service
-+++ ServiceReport-2.2.3/service/servicereport.service
-@@ -3,6 +3,17 @@ Description=ServiceReport
- Wants=kdump.service
- 
- [Service]
-+# added automatically, for details please see
-+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
-+ProtectSystem=full
-+ProtectHome=true
-+PrivateDevices=true
-+ProtectHostname=true
-+ProtectClock=true
-+ProtectKernelTunables=true
-+ProtectKernelModules=true
-+ProtectKernelLogs=true
-+ProtectControlGroups=true
- Type=oneshot
- ExecStart=/usr/bin/servicereport -v
-