From 0d6aa1b4e42a8f72e674dcdabe0b52fd492c88200c456a28c32c9df8b1b7e95e Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <mail@bernhard-voelker.de>
Date: Sat, 21 Nov 2020 07:36:56 +0000
Subject: [PATCH] Accepting request 849597 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

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

diff --git a/findutils.changes b/findutils.changes
index 444e829..208266e 100644
--- a/findutils.changes
+++ b/findutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 16 09:48:05 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Sun Aug 30 09:28:55 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de>
 
diff --git a/findutils.spec b/findutils.spec
index ca6a745..bca3a8f 100644
--- a/findutils.spec
+++ b/findutils.spec
@@ -107,10 +107,10 @@ make DESTDIR=%{buildroot} install
 
 rm -f %{buildroot}%{_infodir}/find-maint*
 %find_lang %{name}
-#UsrMerge
+%if !0%{?usrmerged}
 mkdir -p %{buildroot}/bin
 ln -sf %{_bindir}/find %{buildroot}/bin
-#UsrMerge
+%endif
 
 rm %{buildroot}%{_bindir}/locate
 rm %{buildroot}%{_bindir}/updatedb
@@ -129,9 +129,9 @@ rm %{buildroot}%{_mandir}/man5/locatedb.5*
 %defattr(-,root,root,-)
 %license COPYING
 %doc AUTHORS NEWS README THANKS TODO
-#UsrMerge
+%if !0%{?usrmerged}
 /bin/find
-#UsrMerge
+%endif
 %{_bindir}/find
 %{_bindir}/xargs
 %doc %{_infodir}/find.info*.gz