From 48d641778cbe65750d91652c3f2c29c328e7bdecb9e4a5013ecaa59aab5bf4b3 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 21 Feb 2012 11:16:46 +0000
Subject: [PATCH] Accepting request 106100 from Base:System

- keep binaries in /usr (UserMerge project)

OBS-URL: https://build.opensuse.org/request/show/106100
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=73
---
 coreutils.changes |  5 +++++
 coreutils.spec    | 30 +++++++++++++++++++-----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/coreutils.changes b/coreutils.changes
index 5e2bfd0..0560b12 100644
--- a/coreutils.changes
+++ b/coreutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb  6 17:18:37 UTC 2012 - rschweikert@suse.com
+
+- keep binaries in /usr (UserMerge project)
+
 -------------------------------------------------------------------
 Mon Dec 19 15:09:12 UTC 2011 - lnussel@suse.de
 
diff --git a/coreutils.spec b/coreutils.spec
index 40af4ec..e5680bb 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -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 @@ make %{?_smp_mflags} V=1
 %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 @@ echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1
 %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