From 3e9f9a49ef5bdee64542c6307ad8707973014d1932af628017b14c22c723f383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?=
 <vcizek@suse.com>
Date: Mon, 6 Feb 2012 12:48:20 +0000
Subject: [PATCH] Accepting request 102480 from
 home:rjschwei:branches:Archiving

usrMerge project - move files from toplevel to /usr

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

diff --git a/cpio.changes b/cpio.changes
index 5116305..ab0d5f2 100644
--- a/cpio.changes
+++ b/cpio.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:31:13 UTC 2012 - rschweikert@suse.com
+
+- leave binary in /usr (UsrMerge project), link to binary from /bin
+
 -------------------------------------------------------------------
 Mon Jan  2 17:27:13 UTC 2012 - vcizek@suse.cz
 
diff --git a/cpio.spec b/cpio.spec
index 116352f..51d20c8 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -97,8 +97,9 @@ make %{?_smp_mflags}
 %install
 mkdir -p $RPM_BUILD_ROOT/{usr/bin,bin}
 make prefix=$RPM_BUILD_ROOT/usr infodir=$RPM_BUILD_ROOT/%_infodir mandir=$RPM_BUILD_ROOT/%_mandir install
-mv $RPM_BUILD_ROOT/usr/bin/cpio $RPM_BUILD_ROOT/bin
-ln -sf ../../bin/cpio $RPM_BUILD_ROOT/usr/bin/cpio
+#UsrMerge 
+ln -sf %_bindir/cpio $RPM_BUILD_ROOT/bin
+#EndUsrMerge 
 %find_lang %{name}
 
 %post
@@ -112,9 +113,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+#UsrMerge 
 /bin/cpio
-/usr/bin/cpio
-/usr/bin/mt
+#EndUsrMerge 
+%_bindir/cpio
+%_bindir/mt
 %doc %{_infodir}/cpio.info.gz
 %doc %{_mandir}/man1/cpio.1.gz
 %doc %{_mandir}/man1/mt.1.gz