From 77ca2c61dbc471d874771c6a5e1ac3ba3807ae73eb94c7611658bb59bff1021b Mon Sep 17 00:00:00 2001
From: Kristyna Streitova <kstreitova@suse.com>
Date: Mon, 23 Nov 2020 17:32:25 +0000
Subject: [PATCH] Accepting request 849684 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

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

diff --git a/tar.changes b/tar.changes
index 7d9d629..9cd0706 100644
--- a/tar.changes
+++ b/tar.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 19 16:20:06 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Fri Apr  3 07:20:20 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/tar.spec b/tar.spec
index 39b33b2..d53ef23 100644
--- a/tar.spec
+++ b/tar.spec
@@ -156,10 +156,10 @@ rm %{buildroot}%{_localstatedir}/lib/tests/tar/{atconfig,atlocal,Makefile}*
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 ln -sf %{_sysconfdir}/alternatives/rmt %{buildroot}%{_bindir}/rmt
 ln -sf %{_sysconfdir}/alternatives/rmt.1%{ext_man} %{buildroot}%{_mandir}/man1/rmt.1%{ext_man}
-#UsrMerge
+%if !0%{?usrmerged}
 mkdir -p %{buildroot}/bin
 ln -s %{_bindir}/%{name} %{buildroot}/bin
-#EndUsrMerge
+%endif
 %find_lang %{name}
 
 %post doc
@@ -213,9 +213,9 @@ fi
 
 %files
 %license COPYING
-#UsrMerge
+%if !0%{?usrmerged}
 /bin/%{name}
-#EndUsrMerge
+%endif
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1%{?ext_man}