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

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849580
OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=84
---
 cpio.changes | 5 +++++
 cpio.spec    | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cpio.changes b/cpio.changes
index e254e2a..01d1b62 100644
--- a/cpio.changes
+++ b/cpio.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 16 08:49:00 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Fri Sep 11 11:45:35 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/cpio.spec b/cpio.spec
index 874408f..d8eb305 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -102,9 +102,9 @@ mkdir -p %{buildroot}/{usr/bin,bin}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 ln -sf %{_sysconfdir}/alternatives/mt %{buildroot}%{_bindir}/mt
 ln -sf %{_sysconfdir}/alternatives/mt.1%{ext_man} %{buildroot}%{_mandir}/man1/mt.1%{ext_man}
-#UsrMerge
+%if !0%{?usrmerged}
 ln -sf %{_bindir}/cpio %{buildroot}/bin
-#EndUsrMerge
+%endif
 
 %find_lang %{name}
 
@@ -130,9 +130,9 @@ fi
 %files
 %license COPYING
 %doc NEWS ChangeLog
-#UsrMerge
+%if !0%{?usrmerged}
 /bin/cpio
-#EndUsrMerge
+%endif
 %{_bindir}/cpio
 %{_infodir}/cpio.info%{?ext_info}
 %{_mandir}/man1/cpio.1%{?ext_man}