From 105574f230a049a853539bd30e1514ae17d89ecf Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Nov 21 2008 15:28:38 +0000
Subject: added requirements for util-linux-ng >= 2.14 (/bin/arch conflict, #472445),

    some sed cleanup

---

diff --git a/coreutils.spec b/coreutils.spec
index 1ede2a4..da07adf 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 6.12
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -77,6 +77,9 @@ BuildRequires: libcap-devel >= 2.0.6
 
 Requires(post): libselinux >= 1.25.6-1
 Requires:       libattr
+#util-linux-ng requirement is here only to prevent /bin/arch conflict
+#(could be removed after F-11/F-12 split, no idea how to solve it better)
+Requires:				util-linux-ng >= 2.14
 Requires(pre): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
@@ -159,19 +162,17 @@ chmod a+x tests/misc/utimensat-touchcp
 chmod a+x tests/ls/capability
 
 #fix typos/mistakes in localized documentation(#439410, #440056)
-for pofile in $(find ./po/*.p*)
-do
-   sed -i 's/-dpR/-cdpR/' "$pofile"
-   sed -i 's/commmand/command/' "$pofile"
-done
-
+find ./po/ -name "*.p*" | xargs \
+ sed -i \
+ -e 's/-dpR/-cdpR/' \
+ -e 's/commmand/command/'
 
 %build
 %ifarch s390 s390x
 # Build at -O1 for the moment (bug #196369).
-export CFLAGS="$RPM_OPT_FLAGS -fPIC -O1"
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC -O1"
 %else
-export CFLAGS="$RPM_OPT_FLAGS -fpic"
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fpic"
 %endif
 %{expand:%%global optflags %{optflags} -D_GNU_SOURCE=1}
 touch aclocal.m4 configure config.hin Makefile.in */Makefile.in
@@ -339,6 +340,11 @@ fi
 /sbin/runuser
 
 %changelog
+* Fri Nov 21 2008 Ondrej Vasik <ovasik@redhat.com> - 6.12-18
+- added requirements for util-linux-ng >= 2.14
+  because of file conflict in update from F-8/F-9(#472445)
+- some sed cleanup
+
 * Mon Nov 03 2008 Ondrej Vasik <ovasik@redhat.com> - 6.12-17
 - Requires: ncurses (#469277)