From 49a3f898a677418ebf35797f684a44687016f13d Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Apr 20 2006 11:39:12 +0000
Subject: - Make 'ls -Z' output more consistent with other output formats.


---

diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch
index a603c9b..5f35570 100644
--- a/coreutils-selinux.patch
+++ b/coreutils-selinux.patch
@@ -1160,8 +1160,8 @@
 +  }
 +  return 1; /* can't reach this statement.... */
 +}
---- coreutils-5.94/src/ls.c.selinux	2006-03-24 13:23:38.000000000 +0000
-+++ coreutils-5.94/src/ls.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.94/src/ls.c	2006-03-24 13:23:45.000000000 +0000
++++ coreutils-5.94/src/ls.c	2006-04-20 12:24:40.000000000 +0100
 @@ -135,6 +135,18 @@
  
  #define AUTHORS "Richard Stallman", "David MacKenzie"
@@ -1692,10 +1692,7 @@
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
        fputs (_("\n\
-@@ -4244,3 +4403,83 @@
-     }
-   exit (status);
- }
+@@ -4246,0 +4406,67 @@
 +
 +#ifdef WITH_SELINUX
 +
@@ -1734,23 +1731,10 @@
 +
 +    /* print standard user and group */
 +
-+    user_name = f->stat_failed ? "?" :
-+	    (numeric_ids ? NULL : getuser (f->stat.st_uid));
-+    if (user_name)
-+      (void) sprintf (p, "%-8.8s ", user_name);
-+    else
-+      (void) sprintf (p, "%-8u ", (unsigned int) f->stat.st_uid);
-+    p += strlen (p);
-+
-+    if ( print_group ) {
-+      group_name = f->stat_failed ? "?" :
-+	      (numeric_ids ? NULL : getgroup (f->stat.st_gid));
-+      if (group_name)
-+	(void) sprintf (p, "%-8.8s ", group_name);
-+      else
-+	(void) sprintf (p, "%-8u ", (unsigned int) f->stat.st_gid);
-+      p += strlen (p);
-+    }
++    DIRED_FPUTS (buf, stdout, p - buf);
++    format_user (f->stat.st_uid, owner_width, f->stat_failed);
++    format_group (f->stat.st_gid, group_width, f->stat_failed);
++    p = buf;
 +  }
 +
 +  (void) sprintf (p, "%-32s ", f->scontext ?: "");
diff --git a/coreutils.spec b/coreutils.spec
index 558e51a..9013659 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: 5.94
-Release: 2
+Release: 3
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -261,6 +261,9 @@ fi
 /sbin/runuser
 
 %changelog
+* Thu Apr 20 2006 Tim Waugh <twaugh@redhat.com> 5.94-3
+- Make 'ls -Z' output more consistent with other output formats.
+
 * Fri Mar 24 2006 Tim Waugh <twaugh@redhat.com> 5.94-2
 - 5.94.