Hello community, here is the log from the commit of package coreutils for openSUSE:Factory checked in at 2012-02-21 12:16:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/coreutils (Old) and /work/SRC/openSUSE:Factory/.coreutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "coreutils", Maintainer is "p...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/coreutils/coreutils.changes 2012-01-04 08:00:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.coreutils.new/coreutils.changes 2012-02-21 12:16:48.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 6 17:18:37 UTC 2012 - rschweik...@suse.com + +- keep binaries in /usr (UserMerge project) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.i8cYVk/_old 2012-02-21 12:16:51.000000000 +0100 +++ /var/tmp/diff_new_pack.i8cYVk/_new 2012-02-21 12:16:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package coreutils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,18 @@ # - Name: coreutils Summary: GNU Core Utilities -BuildRequires: automake help2man libacl-devel libcap-devel libselinux-devel pam-devel xz -Url: http://www.gnu.org/software/coreutils/ License: GPL-3.0+ Group: System/Base +BuildRequires: automake +BuildRequires: help2man +BuildRequires: libacl-devel +BuildRequires: libcap-devel +BuildRequires: libselinux-devel +BuildRequires: pam-devel +BuildRequires: xz +Url: http://www.gnu.org/software/coreutils/ Version: 8.14 Release: 0 Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version} @@ -118,14 +123,13 @@ %makeinstall pkglibexecdir=%{_libdir}/%{name} test -f %{buildroot}%{_bindir}/su || \ install src/su %{buildroot}%{_bindir}/su +#UsrMerge install -d %{buildroot}/bin for i in arch basename cat chgrp chmod chown cp date dd df echo false kill ln ls mkdir mknod mktemp mv pwd rm rmdir sleep sort stat stty su sync touch true uname readlink md5sum do - mv %{buildroot}%{_bindir}/$i %{buildroot}/bin/$i - test $i = su && echo -n '%%attr(4755,root,root) ' - echo /bin/$i -done > bin.files -ln -sf ../../bin/{basename,sort,stat,touch,readlink,md5sum} %{buildroot}%{_bindir} + ln -sf %{_bindir}/$i %{buildroot}/bin/$i +done +#EndUsrMerge install -d -m 755 %{buildroot}/etc/pam.d install -m 644 %{S:1} %{buildroot}/etc/pam.d/su install -m 644 %{S:1} %{buildroot}/etc/pam.d/su-l @@ -143,15 +147,19 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz %verifyscript -%verify_permissions -e /bin/su +%verify_permissions -e %{_bindir}/su -%files -f bin.files +%files %defattr(-,root,root) %doc README NEWS %config %{_sysconfdir}/pam.d/su %config %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/default/su +%attr(4755,root,root) %{_bindir}/su %{_bindir}/* +#UsrMerge +/bin/* +#EndUsrMerge %{_libdir}/%{name} %doc %{_infodir}/coreutils.info*.gz %doc %{_mandir}/man1/*.1.gz -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
