From ba5aa3b00fffcfa47c4a439f35d39c81b61a98fa Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 20 Nov 2020 13:11:36 +0000
Subject: [PATCH] Accepting request 849668 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

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

diff --git a/psmisc.changes b/psmisc.changes
index 32145ba..44ef4ed 100644
--- a/psmisc.changes
+++ b/psmisc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 16 10:18:52 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Mon Apr 27 14:57:57 UTC 2020 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/psmisc.spec b/psmisc.spec
index 2b9cb56..2864b68 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -83,8 +83,10 @@ make check
 
 %install
 make DESTDIR=%{buildroot} install
+%if !0%{?usrmerged}
 mkdir -p %{buildroot}/bin/
 ln -sf %{_bindir}/fuser %{buildroot}/bin/
+%endif
 %ifnarch %have_peekfd
 rm -f %{buildroot}%{_mandir}/man1/peekfd.1*
 %endif
@@ -93,7 +95,9 @@ rm -f %{buildroot}%{_mandir}/man1/peekfd.1*
 %files
 %defattr (-,root,root,755)
 %license COPYING
+%if !0%{?usrmerged}
 /bin/fuser
+%endif
 %{_bindir}/fuser
 %{_bindir}/killall
 %ifarch %have_peekfd