From fcebba836b982c56d5cc602105ba8ddda8c7ab4b Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 9 Jan 2023 10:21:59 +0000
Subject: [PATCH] Accepting request 1055724 from home:lnussel:usrmerge

Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1055724
OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=143
---
 psmisc.changes | 5 +++++
 psmisc.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/psmisc.changes b/psmisc.changes
index 79d00ae..ec6fe4b 100644
--- a/psmisc.changes
+++ b/psmisc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 13:15:30 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Tue Dec 13 08:01:33 UTC 2022 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/psmisc.spec b/psmisc.spec
index 90fbf44..625c027 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -83,7 +83,7 @@ make check
 
 %install
 make DESTDIR=%{buildroot} install
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir -p %{buildroot}/bin/
 ln -sf %{_bindir}/fuser %{buildroot}/bin/
 %endif
@@ -95,7 +95,7 @@ rm -f %{buildroot}%{_mandir}/man1/peekfd.1*
 %files
 %defattr (-,root,root,755)
 %license COPYING
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/fuser
 %endif
 %{_bindir}/fuser