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