From 5ce61cdfc729f73297db5f35e87bc83007f9a3efa16e4928de46e165ac5881e6 Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <mail@bernhard-voelker.de>
Date: Sun, 22 Nov 2020 15:50:42 +0000
Subject: [PATCH] Accepting request 849579 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849579
OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=315
---
 coreutils.changes | 5 +++++
 coreutils.spec    | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/coreutils.changes b/coreutils.changes
index a4072ad..e57ce51 100644
--- a/coreutils.changes
+++ b/coreutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 16 07:26:20 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Mon Aug 31 07:14:12 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de>
 
diff --git a/coreutils.spec b/coreutils.spec
index df1c597..27813a7 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -68,6 +68,9 @@ BuildRequires:  valgrind
 %if "%{name}" == "coreutils" || "%{name}" == "coreutils-single"
 Provides:       fileutils = %{version}
 Provides:       mktemp = %{version}
+%if 0%{?usrmerged}
+Provides:       /bin/mktemp
+%endif
 Provides:       sh-utils = %{version}
 Provides:       stat = %{version}
 Provides:       textutils = %{version}
@@ -251,6 +254,7 @@ ln -v lib/parse-datetime.{c,y} .
 make install DESTDIR="%buildroot" pkglibexecdir=%{_libdir}/%{name}
 
 #UsrMerge
+%if !0%{?usrmerged}
 install -d %{buildroot}/bin
 for i in arch basename cat chgrp chmod chown cp date dd df echo \
   false ln ls mkdir mknod mktemp mv pwd rm rmdir sleep sort stat \
@@ -258,6 +262,7 @@ for i in arch basename cat chgrp chmod chown cp date dd df echo \
 do
   ln -sf %{_bindir}/$i %{buildroot}/bin/$i
 done
+%endif
 #EndUsrMerge
 echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1
 %if "%{name}" == "coreutils"
@@ -294,7 +299,9 @@ rm -rf %{buildroot}%{_datadir}/locale
 %doc NEWS README THANKS
 %{_bindir}/*
 #UsrMerge
+%if !0%{?usrmerged}
 /bin/*
+%endif
 #EndUsrMerge
 %{_libdir}/%{name}