From 69a30cc62d3f7075f63a0251d31174737755697510308ba900d1717a6a5761cd Mon Sep 17 00:00:00 2001
From: Avindra Goolcharan <aavindraa@gmail.com>
Date: Wed, 2 Dec 2020 23:32:42 +0000
Subject: [PATCH] Accepting request 851091 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/851091
OBS-URL: https://build.opensuse.org/package/show/shells/dash?expand=0&rev=34
---
 dash.changes | 5 +++++
 dash.spec    | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/dash.changes b/dash.changes
index c3cc8e4..5cb14fa 100644
--- a/dash.changes
+++ b/dash.changes
@@ -10,6 +10,11 @@ Sun Oct 18 18:08:34 UTC 2020 - Dirk Mueller <dmueller@suse.com>
   * shell: Group readdir64/dirent64 with open64 
 - add LICENSE file
 
+-------------------------------------------------------------------
+Fri Oct 16 09:00:37 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Sun Aug 16 17:55:38 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/dash.spec b/dash.spec
index 34de77c..97078d6 100644
--- a/dash.spec
+++ b/dash.spec
@@ -48,14 +48,18 @@ possible without sacrificing speed where possible.
 %install
 %make_install
 # compatibility symlink to /bin
+%if !0%{?usrmerged}
 mkdir -p %{buildroot}/bin
 ln -s %{_bindir}/dash %{buildroot}/bin/dash
+%endif
 
 %files
 %license COPYING
 %doc ChangeLog
 %{_bindir}/dash
+%if !0%{?usrmerged}
 /bin/dash
+%endif
 %{_mandir}/man1/dash.1%{?ext_man}
 
 %changelog