From f3e13e8d1d6cff862effc2d54eb4034e5e1fa551e0c1d82af6a9ac310b193615 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 27 Mar 2024 13:15:32 +0000
Subject: [PATCH] Accepting request 1149881 from home:dimstar:rpm4.20:r

Prepare for RPM 4.20

OBS-URL: https://build.opensuse.org/request/show/1149881
OBS-URL: https://build.opensuse.org/package/show/hardware/rtasdispd?expand=0&rev=6
---
 rtasdispd.changes |  6 ++++++
 rtasdispd.spec    | 44 ++++++++++++++++++--------------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/rtasdispd.changes b/rtasdispd.changes
index 996edd5..63d492f 100644
--- a/rtasdispd.changes
+++ b/rtasdispd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 23 11:55:45 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use %autosetup macro. Allows to eliminate the usage of deprecated
+  %patchN.
+
 -------------------------------------------------------------------
 Thu Nov 23 13:43:40 UTC 2017 - rbrown@suse.com
 
diff --git a/rtasdispd.spec b/rtasdispd.spec
index 5560435..9398d9c 100644
--- a/rtasdispd.spec
+++ b/rtasdispd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package rtasdispd
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,27 +12,27 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-
 Name:           rtasdispd
 Version:        0.1
 Release:        0
 Summary:        Shows System Status Messages on pSeries Panel Displays
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Monitoring
-PreReq:         %insserv_prereq %fillup_prereq
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         rtasdispd-%{version}.tar.gz
 Source1:        sysconfig.rtasdispd
 Source2:        rc.rtasdispd
 Patch1:         rtasdispd.open-mode.patch
+# FIXME: use proper Requires(pre/post/preun/...)
+PreReq:         %fillup_prereq
+PreReq:         %insserv_prereq
 ExclusiveArch:  ppc ppc64 ppc64le
 
 %description
@@ -40,27 +40,20 @@ This daemon can show system status information, such as load, uptime,
 memory usage, and more on the 2 line front panel display of IBM pSeries
 machines.
 
-
-
-Authors:
---------
-    Roman Hodek <roman@hodek.net>
-
 %prep
-%setup  -q
-%patch1 -p1
+%autosetup  -p1
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS -Wall"
+%make_build CFLAGS="%{optflags} -Wall"
 
 %install
 mv rtasdispd.1 rtasdispd.8
-make DESTDIR=$RPM_BUILD_ROOT install MANS=rtasdispd.8
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
-install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/rtasdispd
-ln -s ../../etc/init.d/rtasdispd $RPM_BUILD_ROOT/usr/sbin/rcrtasdispd
-install -m 644 %{S:1} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.rtasdispd
+make DESTDIR=%{buildroot} install MANS=rtasdispd.8
+mkdir -p %{buildroot}%{_initddir}
+mkdir -p %{buildroot}%{_fillupdir}
+install -m 755 %{SOURCE2} %{buildroot}%{_initddir}/rtasdispd
+ln -s ../..%{_initddir}/rtasdispd %{buildroot}%{_sbindir}/rcrtasdispd
+install -m 644 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.rtasdispd
 
 %post
 %{fillup_and_insserv -y rtasdispd}
@@ -69,10 +62,9 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.rtasdispd
 %insserv_cleanup
 
 %files
-%defattr(-,root,root)
-%doc COPYING 
-%config /etc/init.d/rtasdispd
-/usr/sbin/*
+%license COPYING
+%config %{_initddir}/rtasdispd
+%{_sbindir}/*
 %{_mandir}/man8/*
 %{_fillupdir}/sysconfig.rtasdispd