Mailinglist Archive: opensuse-commit (1737 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package cpio for openSUSE:Factory checked in 
at 2012-02-07 14:45:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cpio (Old)
 and      /work/SRC/openSUSE:Factory/.cpio.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "cpio", Maintainer is "VCizek@xxxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/cpio/cpio.changes        2012-01-20 
20:23:15.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cpio.new/cpio.changes   2012-02-07 
14:45:04.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Feb  2 13:31:13 UTC 2012 - rschweikert@xxxxxxxx
+
+- leave binary in /usr (UsrMerge project), link to binary from /bin
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cpio.spec ++++++
--- /var/tmp/diff_new_pack.FZuST2/_old  2012-02-07 14:45:06.000000000 +0100
+++ /var/tmp/diff_new_pack.FZuST2/_new  2012-02-07 14:45:06.000000000 +0100
@@ -97,8 +97,9 @@
 %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 @@
 
 %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

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx