fix of some typos and manpages (#44056, #439410), fix colorls.sh syntax for

Zsh (#440652)

coreutils-5.2.1-runuser.patch

@@ -333,7 +333,7 @@
 +-, \fB\-l\fR, \fB\-\-login\fR
 +make the shell a login shell, uses runuser-l PAM file instead of default one.
 +.TP
-+\fB\-c\fR, \fB\-\-commmand\fR=\fICOMMAND\fR
++\fB\-c\fR, \fB\-\-command\fR=\fICOMMAND\fR
 +pass a single COMMAND to the shell with \fB\-c\fR
 +.TP
 +\fB\-f\fR, \fB\-\-fast\fR

coreutils-colorls.sh

@@ -18,7 +18,7 @@ if [ -z "$USER_LS_COLORS" ]; then
   done
 
   [ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.256color" ] && \
-      [ "`tput colors 2>/dev/null`" == "256" ] && \
+      [ "x`tput colors 2>/dev/null`" = "x256" ] && \
       COLORS="/etc/DIR_COLORS.256color"
 
   if [ -z "$COLORS" ]; then

coreutils-selinux.patch

@@ -341,6 +341,15 @@ diff -urp coreutils-6.10-orig/src/cp.c coreutils-6.10/src/cp.c
    {GETOPT_HELP_OPTION_DECL},
    {GETOPT_VERSION_OPTION_DECL},
    {NULL, 0, NULL, 0}
+@@ -175,7 +175,7 @@ Copy SOURCE to DEST, or multiple SOURCE(
+ Mandatory arguments to long options are mandatory for short options too.\n\
+ "), stdout);
+       fputs (_("\
+-  -a, --archive                same as -dpR\n\
++  -a, --archive                same as -cdpR\n\
+       --backup[=CONTROL]       make a backup of each existing destination file\n\
+   -b                           like --backup but does not accept an argument\n\
+       --copy-contents          copy contents of special files when recursive\n\
 @@ -200,6 +201,9 @@ Mandatory arguments to long options are 
                                   additional attributes: context, links, all\n\
  "), stdout);

coreutils-selinuxmanpages.patch

@@ -0,0 +1,70 @@
+diff -urNp coreutils-6.10-orig/man/cp.1 coreutils-6.10/man/cp.1
+--- coreutils-6.10-orig/man/cp.1	2008-04-07 14:46:37.000000000 +0200
++++ coreutils-6.10/man/cp.1	2008-04-07 15:34:17.000000000 +0200
+@@ -19,7 +19,7 @@ Copy SOURCE to DEST, or multiple SOURCE(
+ Mandatory arguments to long options are mandatory for short options too.
+ .TP
+ \fB\-a\fR, \fB\-\-archive\fR
+-same as \fB\-dpR\fR
++same as \fB\-cdpR\fR
+ .TP
+ \fB\-\-backup\fR[=\fICONTROL\fR]
+ make a backup of each existing destination file
+@@ -55,6 +55,9 @@ never follow symbolic links in SOURCE
+ \fB\-p\fR
+ same as \fB\-\-preserve\fR=\fImode\fR,ownership,timestamps
+ .TP
++\fB\-c\fR
++same as \fB\-\-preserve\fR=context\fR
++.TP
+ \fB\-\-preserve\fR[=\fIATTR_LIST\fR]
+ preserve the specified attributes (default:
+ mode,ownership,timestamps), if possible
+diff -urNp coreutils-6.10-orig/doc/coreutils.info coreutils-6.10/doc/coreutils.info
+--- coreutils-6.10-orig/doc/coreutils.info	2008-04-07 17:52:11.000000000 +0200
++++ coreutils-6.10/doc/coreutils.info	2008-04-07 18:03:27.000000000 +0200
+@@ -5642,7 +5642,7 @@ options::.
+      Preserve as much as possible of the structure and attributes of the
+      original files in the copy (but do not attempt to preserve internal
+      directory structure; i.e., `ls -U' may list the entries in a copied
+-     directory in a different order).  Equivalent to `-dpR'.
++     directory in a different order).  Equivalent to `-cdpR'.
+ 
+ `-b'
+ `--backup[=METHOD]'
+@@ -5660,6 +5660,11 @@ options::.
+             cp --backup --force -- "$i" "$i"
+           done
+ 
++`-c'
++     Preserve SELinux security context of the original files if possible.
++     Note: Some file systems don't support storing of SELinux security 
++           context.
++
+ `--copy-contents'
+      If copying recursively, copy the contents of any special files
+      (e.g., FIFOs and device files) as if they were regular files.
+diff -urNp coreutils-6.10-orig/doc/coreutils.texi coreutils-6.10/doc/coreutils.texi
+--- coreutils-6.10-orig/doc/coreutils.texi	2008-04-07 17:52:11.000000000 +0200
++++ coreutils-6.10/doc/coreutils.texi	2008-04-07 18:01:43.000000000 +0200
+@@ -6957,7 +6957,7 @@ Preserve as much as possible of the stru
+ original files in the copy (but do not attempt to preserve internal
+ directory structure; i.e., @samp{ls -U} may list the entries in a copied
+ directory in a different order).
+-Equivalent to @option{-dpR}.
++Equivalent to @option{-cdpR}.
+ 
+ @item -b
+ @itemx @w{@kbd{--backup}[=@var{method}]}
+@@ -6981,6 +6981,11 @@ for i; do
+ done
+ @end example
+ 
++@item -c
++@cindex SELinux security context information, preserving
++Preserve SELinux security context of the original files if possible.
++Some file systems don't support storing of SELinux security context.
++
+ @item --copy-contents
+ @cindex directories, copying recursively
+ @cindex copying directories recursively

coreutils.spec

@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 6.10
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -53,6 +53,7 @@ Patch916: coreutils-getfacl-exit-code.patch
 #SELINUX Patch - implements Redhat changes 
 #(upstream did some SELinux implementation unlike with RedHat patch)
 Patch950: coreutils-selinux.patch
+Patch951: coreutils-selinuxmanpages.patch
 
 BuildRequires: libselinux-devel >= 1.25.6-1
 BuildRequires: libacl-devel
@@ -132,10 +133,19 @@ cd %name-%version
 
 #SELinux
 %patch950 -p1 -b .selinux
+%patch951 -p1 -b .selinuxman
 
 chmod a+x tests/sort/sort-mb-tests
 chmod a+x tests/mkdir/selinux
 
+#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
+
+
 %build
 %ifarch s390 s390x
 # Build at -O1 for the moment (bug #196369).
@@ -302,6 +312,12 @@ fi
 /sbin/runuser
 
 %changelog
+* Mon Apr  7 2008 Ondrej Vasik <ovasik@redhat.com> - 6.10-18
+- fix colorls.sh syntax with Zsh (#440652)
+- mention that cp -a includes -c option + mention cp -c 
+  option in manpages (#440056)
+- fix typo in runuser manpages (#439410)
+
 * Sat Mar 29 2008 Ondrej Vasik <ovasik@redhat.com> - 6.10-17
 - better workaround of glibc getoptc change(factor test)
 - don't segfault mknod, mkfifo with invalid-selinux-context