Accepting request 853760 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/853760
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/psmisc?expand=0&rev=75

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>
 

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