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.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}