Tue Nov 11 16:03:51 UTC 2008

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26802

Modified Files:
	coreutils-463883-chcon-changes.patch 
	coreutils-5.2.1-runuser.patch coreutils-6.10-manpages.patch 
	coreutils-6.11-sparc-shafix.patch 
	coreutils-getfacl-exit-code.patch coreutils-i18n.patch 
	coreutils-pam.patch coreutils-selinux.patch coreutils.spec 
Added Files:
	coreutils-7.0-dftotal.patch 
Removed Files:
	coreutils-6.12-catch-known-testsuite-failures.patch 
	coreutils-6.12-date_timerelsnumber.patch 
	coreutils-6.12-dd-fullblock.patch 
	coreutils-6.12-ls-constant_mem.patch 
	coreutils-6.12-ls-libcap.patch 
	coreutils-6.12-seqdecimalutf8.patch 
	coreutils-6.12-utimenstouchcp.patch coreutils-authors.patch 
	coreutils-futimensatkoji.patch coreutils-who_texinfo.patch 
Log Message:
New upstream release (+ amending/droping patches)

coreutils-7.0-dftotal.patch:

--- NEW FILE coreutils-7.0-dftotal.patch ---
diff -urNp coreutils-7.0-orig/tests/df/total coreutils-7.0/tests/df/total
--- coreutils-7.0-orig/tests/df/total	2008-09-27 19:28:54.000000000 +0200
+++ coreutils-7.0/tests/df/total	2008-11-11 16:56:17.000000000 +0100
@@ -30,11 +30,8 @@ umask 22
 
 RE_TOTAL='^total( +(-?[0-9]+|-)){3} +-?[0-9]+%$'
 
-df > tmp || fail=1
-$EGREP "$RE_TOTAL" tmp && fail=1
-
-df -i > tmp || fail=1
-$EGREP "$RE_TOTAL" tmp && fail=1
+df    | $EGREP "$RE_TOTAL" tmp && fail=1
+df -i | $EGREP "$RE_TOTAL" tmp && fail=1
 
 df --total | $EGREP "$RE_TOTAL" || fail=1
 df -i --total | $EGREP "$RE_TOTAL" || fail=1
diff -urNp coreutils-7.0-orig/tests/df/total-awk coreutils-7.0/tests/df/total-awk
--- coreutils-7.0-orig/tests/df/total-awk	2008-09-27 19:28:54.000000000 +0200
+++ coreutils-7.0/tests/df/total-awk	2008-11-11 16:54:49.000000000 +0100
@@ -23,58 +23,42 @@ fi
 
 . $srcdir/test-lib.sh
 
-fail=0
-
-# Don't let a different umask perturb the results.
-umask 22
-
-echo '
-BEGIN {
-  total     = 0
-  used      = 0
-  available = 0
-}
-{
-  if (NR==1 || $0==$1 || $0~/^total +(-?[0-9]+|-) +(-?[0-9]+|-) +(-?[0-9]+|-) +-?[0-9]+%$/)
-    next
-  if ($1~/^[0-9]/)
-    {
-      total     += $1
-      used      += $2
-      available += $3
-    }
-  else
-    {
-      total     += $2
-      used      += $3
-      available += $4
-    }
-}
-END {
-  print total
-  print used
-  print available
-}
-' > compute_sum.awk || fail=1
-
-echo '
-/^total +(-?[0-9]+|-) +(-?[0-9]+|-) +(-?[0-9]+|-) +-?[0-9]+%$/ {
-  print $2;
-  print $3;
-  print $4
-}
-' > parse_total.awk || fail=1
+cat <<\EOF > check-df || framework_failure
+my ($total, $used, $avail) = (0, 0, 0);
+while (<>)
+  {
+    $. == 1
+      and next;  # skip first (header) line
+    # Recognize df output lines like these:
+    # /dev/sdc1                  0       0       0    -  /c
+    # tmpfs                1536000   12965 1523035    1% /tmp
+    # total                5285932  787409 4498523   15%
+    /^(.*?) +(-?\d+|-) +(-?\d+|-) +(-?\d+|-) +(?:- |[0-9]+%)(.*)$/
+      or die "$0: invalid input line\n: $_";
+    if ($1 eq 'total' && $5 eq '')
+      {
+	$total == $2 or die "$total != $2";
+	$used  == $3 or die "$used  != $3";
+	$avail == $4 or die "$avail != $4";
+	my $line = <>;
+	defined $line
+	  and die "$0: extra line(s) after totals\n";
+	exit 0;
+      }
+    $total += $2 unless $2 eq '-';
+    $used  += $3 unless $3 eq '-';
+    $avail += $4 unless $4 eq '-';
+  }
+die "$0: missing line of totals\n";
+EOF
 
 # Use --block-size=512 to keep df from printing rounded-to-kilobyte
 # numbers which wouldn't necessarily add up to the displayed total.
-df --block-size=512 --total |tee tmp || fail=1
-$AWK -f compute_sum.awk tmp > out1 || fail=1
-$AWK -f parse_total.awk tmp > out2 || fail=1
-compare out1 out2 || fail=1
+df --total -P --block-size=512 |tee space || framework_failure
+df --total -i -P               |tee inode || framework_failure
 
-df -i --block-size=512 --total |tee tmp || fail=1
-$AWK -f compute_sum.awk tmp > out1 || fail=1
-$AWK -f parse_total.awk tmp > out2 || fail=1
-compare out1 out2 || fail=1
+fail=0
+$PERL -f check-df space || fail=1
+$PERL -f check-df inode || fail=1
 
 Exit $fail

coreutils-463883-chcon-changes.patch:

Index: coreutils-463883-chcon-changes.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-463883-chcon-changes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coreutils-463883-chcon-changes.patch	22 Oct 2008 11:38:16 -0000	1.3
+++ coreutils-463883-chcon-changes.patch	11 Nov 2008 16:03:46 -0000	1.4
@@ -25,8 +25,8 @@
 -  V_off
 -};
  
- /* The name the program was run with. */
- char *program_name;
+ /* If nonzero, and the systems has support for it, change the context
+    of symbolic links rather than any files they point to.  */
 @@ -374,7 +355,6 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\
  Change the SELinux security context of each FILE to CONTEXT.\n\
  With --reference, change the security context of each FILE to that of RFILE.\n\

coreutils-5.2.1-runuser.patch:

Index: coreutils-5.2.1-runuser.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- coreutils-5.2.1-runuser.patch	22 Oct 2008 11:07:43 -0000	1.21
+++ coreutils-5.2.1-runuser.patch	11 Nov 2008 16:03:47 -0000	1.22
@@ -3,7 +3,7 @@
 +++ coreutils-6.12/AUTHORS	2008-10-21 15:00:05.000000000 +0200
 @@ -63,6 +63,7 @@ pwd: Jim Meyering
  readlink: Dmitry V. Levin
- rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering
+ rm: Paul Rubin, David MacKenzie, Richard M. Stallman, Jim Meyering
  rmdir: David MacKenzie
 +runuser: David MacKenzie, Dan Walsh
  runcon: Russell Coker
@@ -23,17 +23,21 @@
 diff -urNp coreutils-6.12-orig/README coreutils-6.12/README
 --- coreutils-6.12-orig/README	2008-05-15 20:44:37.000000000 +0200
 +++ coreutils-6.12/README	2008-10-21 14:59:29.000000000 +0200
-@@ -12,8 +12,8 @@ The programs that can be built with this
+@@ -12,10 +12,10 @@ The programs that can be built with this
    factor false fmt fold groups head hostid hostname id install join kill
    link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
    od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir
 -  runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf
--  sleep sort split stat stty su sum sync tac tail tee test touch tr true
+-  sleep sort split stat stty su sum sync tac tail tee test timeout touch tr
+-  true truncate tsort tty uname unexpand uniq unlink uptime users vdir wc who
+-  whoami yes
 +  runcon runuser seq sha1sum sha224sum sha256sum sha384sum sha512sum shred
-+  shuf sleep sort split stat stty su sum sync tac tail tee test touch tr true
-   tsort tty uname unexpand uniq unlink uptime users vdir wc who whoami yes
++  shuf sleep sort split stat stty su sum sync tac tail tee test timeout touch
++  tr true truncate tsort tty uname unexpand uniq unlink uptime users vdir wc
++  who whoami yes
  
  See the file NEWS for a list of major changes in the current release.
+ 
 diff -urNp coreutils-6.12-orig/src/Makefile.am coreutils-6.12/src/Makefile.am
 --- coreutils-6.12-orig/src/Makefile.am	2008-10-21 14:58:31.000000000 +0200
 +++ coreutils-6.12/src/Makefile.am	2008-10-21 14:59:58.000000000 +0200
@@ -43,7 +47,7 @@
    id kill logname pathchk printenv printf pwd \
 -  runcon seq sleep tee \
 +  runcon runuser seq sleep tee \
-   test true tty whoami yes \
+   test timeout true truncate tty whoami yes \
    base64
  
 @@ -142,6 +142,10 @@ cp_LDADD += $(LIB_ACL)
@@ -251,7 +255,7 @@
 +#endif
  
    initialize_main (&argc, &argv);
-   program_name = argv[0];
+   set_program_name (argv[0]);
 @@ -670,7 +742,11 @@ main (int argc, char **argv)
    simulate_login = false;
    change_environment = true;
@@ -343,9 +347,9 @@
  sleep_args=0
  su_args=--version
 +runuser_args=--version
+ timeout_args=--version
  
  # I'd rather not run sync, since it spins up disks that I've
- # deliberately caused to spin down (but not unmounted).
 --- /dev/null	2007-01-09 09:38:07.860075128 +0000
 +++ coreutils-6.7/man/runuser.x	2007-01-09 17:27:56.000000000 +0000
 @@ -0,0 +1,12 @@

coreutils-6.10-manpages.patch:

Index: coreutils-6.10-manpages.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-manpages.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coreutils-6.10-manpages.patch	22 Oct 2008 11:07:43 -0000	1.3
+++ coreutils-6.10-manpages.patch	11 Nov 2008 16:03:48 -0000	1.4
@@ -10,20 +10,10 @@
 +"), stdout);
        fputs (_("\
  \n\
- The following two options are useful only when verifying checksums:\n\
+ The following three options are useful only when verifying checksums:\n\
 diff -urNp coreutils-6.12-orig/src/sort.c coreutils-6.12/src/sort.c
 --- coreutils-6.12-orig/src/sort.c	2008-10-21 16:04:50.000000000 +0200
 +++ coreutils-6.12/src/sort.c	2008-10-22 10:52:30.000000000 +0200
-@@ -375,7 +375,8 @@ Other options:\n\
-   -C, --check=quiet, --check=silent  like -c, but do not report first bad line\n\
-       --compress-program=PROG  compress temporaries with PROG;\n\
-                               decompress them with PROG -d\n\
--  -k, --key=POS1[,POS2]     start a key at POS1, end it at POS2 (origin 1)\n\
-+  -k, --key=POS1[,POS2]     start a key at POS1, end it at POS2 (origin 1) -\n\
-+                            when no POS2 specified, end of line is used\n\
-   -m, --merge               merge already sorted files; do not sort\n\
- "), stdout);
-       fputs (_("\
 @@ -412,7 +413,7 @@ With no FILE, or when FILE is -, read st
  \n\
  *** WARNING ***\n\

coreutils-6.11-sparc-shafix.patch:

Index: coreutils-6.11-sparc-shafix.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.11-sparc-shafix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coreutils-6.11-sparc-shafix.patch	2 Jun 2008 11:12:20 -0000	1.2
+++ coreutils-6.11-sparc-shafix.patch	11 Nov 2008 16:03:48 -0000	1.3
@@ -4,7 +4,7 @@
 @@ -101,6 +101,7 @@ shred_LDADD = $(LDADD) $(LIB_GETHRXTIME)
  shuf_LDADD = $(LDADD) $(LIB_GETHRXTIME)
  tac_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
- vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX)
+ vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_CAP)
 +tac_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
  
  ## If necessary, add -lm to resolve use of pow in lib/strtod.c.
@@ -13,8 +13,8 @@
 --- coreutils-6.11/src/Makefile.in.sparc	2008-04-19 16:50:10.000000000 -0500
 +++ coreutils-6.11/src/Makefile.in	2008-05-29 18:40:36.000000000 -0500
 @@ -1251,6 +1251,7 @@ shuf_LDADD = $(LDADD) $(LIB_GETHRXTIME)
- tac_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
- vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_ACL)
+ vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_CAP) \
+ 	$(LIB_ACL)
  sort_LDADD = $(LDADD) $(POW_LIB) $(LIB_GETHRXTIME)
 +tac_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
  

coreutils-getfacl-exit-code.patch:

Index: coreutils-getfacl-exit-code.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-getfacl-exit-code.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- coreutils-getfacl-exit-code.patch	16 Jul 2008 14:22:18 -0000	1.4
+++ coreutils-getfacl-exit-code.patch	11 Nov 2008 16:03:49 -0000	1.5
@@ -20,4 +20,4 @@
 +acl2=`cd b && getfacl file`
  test "$acl1" = "$acl2" || fail=1
  
- (exit $fail); exit $fail
+ Exit $fail

coreutils-i18n.patch:

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- coreutils-i18n.patch	16 Jul 2008 14:22:18 -0000	1.27
+++ coreutils-i18n.patch	11 Nov 2008 16:03:49 -0000	1.28
@@ -90,14 +90,14 @@
 diff -urN coreutils-6.12-orig/tests/Makefile.am coreutils-6.12/tests/Makefile.am
 --- coreutils-6.12-orig/tests/Makefile.am	2008-05-27 13:47:53.000000000 +0200
 +++ coreutils-6.12/tests/Makefile.am	2008-06-02 10:06:03.000000000 +0200
-@@ -191,6 +191,7 @@
-   misc/shuf					\
+@@ -192,6 +192,7 @@
    misc/sort					\
    misc/sort-compress				\
+   misc/sort-files0-from				\
 +  misc/sort-mb-tests				\
    misc/sort-merge				\
    misc/sort-rand				\
-   misc/split-a					\
+   misc/sort-version				\
 @@ -391,6 +392,10 @@
    $(root_tests)
  
@@ -541,8 +541,8 @@
 +}
 +#endif
 + 
- static struct line *
- dup_line (const struct line *old)
+ static void
+ freeline (struct line *line)
  {
 @@ -377,11 +601,18 @@
  
@@ -865,13 +865,13 @@
     return a pointer to the beginning of the line's field to be compared. */
  
  static char *
--find_field (const struct linebuffer *line)
+-find_field (struct linebuffer const *line)
 +find_field_uni (struct linebuffer *line)
  {
    size_t count;
-   char *lp = line->buffer;
+   char const *lp = line->buffer;
 @@ -219,6 +245,83 @@
-   return lp + i;
+   return line->buffer + i;
  }
  
 +#if HAVE_MBRTOWC
@@ -1214,7 +1214,7 @@
  #define TAB_WIDTH 8
  
  /* The official name of this program (e.g., no `g' prefix).  */
-@@ -35,23 +57,44 @@
+@@ -35,20 +57,41 @@
  
  #define AUTHORS proper_name ("David MacKenzie")
  
@@ -1238,9 +1238,6 @@
 +  character_mode,
 +};
 +
- /* The name this program was run with. */
- char *program_name;
- 
 +/* The argument shows current mode. (Default: column_mode) */
 +static enum operating_mode operating_mode;
 +
@@ -1735,7 +1732,7 @@
    if (hard_LC_TIME)
      {
 @@ -1031,6 +1100,64 @@
- #endif
+     xstrtol_fatal (e, oi, c, long_options, s);
  }
  
 +#if HAVE_MBRTOWC
@@ -3900,7 +3897,7 @@
 +  size_t delimlen = 0;
  
    initialize_main (&argc, &argv);
-   program_name = argv[0];
+   set_program_name (argv[0]);
 @@ -770,7 +1090,6 @@
        switch (optc)
  	{
@@ -4025,10 +4022,10 @@
 diff -urNp coreutils-6.12/src/join.c coreutils-6.12-orig/src/join.c
 --- coreutils-6.12/src/join.c	2008-07-16 14:08:01.000000000 +0200
 +++ coreutils-6.12-orig/src/join.c	2008-07-16 14:07:02.000000000 +0200
-@@ -489,6 +489,11 @@ get_line (FILE *fp, struct line *line, i
-   line->nfields_allocated = 0;
-   line->nfields = 0;
-   line->fields = NULL;
+@@ -634,6 +634,11 @@ get_line (FILE *fp, struct line *line, i
+       return false;
+     }
+ 
 +#if HAVE_MBRTOWC
 +  if (MB_CUR_MAX > 1)
 +    xfields_multibyte (line);

coreutils-pam.patch:

Index: coreutils-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-pam.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- coreutils-pam.patch	13 Aug 2008 12:56:00 -0000	1.12
+++ coreutils-pam.patch	11 Nov 2008 16:03:49 -0000	1.13
@@ -66,8 +66,8 @@
       ATTRIBUTE_NORETURN;
 +#endif
  
- /* The name this program was run with.  */
- char *program_name;
+ /* If true, pass the `-f' option to the subshell.  */
+ static bool fast_startup;
 @@ -225,7 +251,26 @@
  }
  #endif
@@ -401,8 +401,8 @@
 -might find this idea strange at first.
 -
 -
- @node Process control
- @chapter Process control
+ @node timeout invocation
+ @section @command{timeout}: Run a command with a time limit
  
 --- coreutils-6.7/configure.ac.pam	2006-12-07 21:30:24.000000000 +0000
 +++ coreutils-6.7/configure.ac	2007-01-09 17:18:04.000000000 +0000

coreutils-selinux.patch:

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- coreutils-selinux.patch	22 Oct 2008 11:29:21 -0000	1.52
+++ coreutils-selinux.patch	11 Nov 2008 16:03:49 -0000	1.53
@@ -37,20 +37,6 @@
 diff -urNp coreutils-6.12-orig/src/chcon.c coreutils-6.12/src/chcon.c
 --- coreutils-6.12-orig/src/chcon.c	2008-05-26 08:40:32.000000000 +0200
 +++ coreutils-6.12/src/chcon.c	2008-06-16 14:43:24.000000000 +0200
-@@ -302,9 +302,11 @@ process_file (FTS *fts, FTSENT *ent)
- 
-   if (ok)
-     {
--      if (verbose)
--	printf (_("changing security context of %s"),
-+      if (verbose) {
-+	printf (_("changing security context of %s"),
- 		quote (file_full_name));
-+	putchar ('\n');
-+     }
- 
-       if (change_file_context (fts->fts_cwd_fd, file) != 0)
- 	ok = false;
 @@ -352,7 +352,7 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\
  "),
  	program_name, program_name, program_name);
@@ -209,8 +195,8 @@
  				     sparse_type_string, sparse_type);
  	  break;
  
--	case 'a':		/* Like -dpPR. */
-+	case 'a':		/* Like -dpPRc. */
+-	case 'a':		/* Like -dpR. */
++	case 'a':		/* Like -dpRc. */
  	  x.dereference = DEREF_NEVER;
  	  x.preserve_links = true;
  	  x.preserve_ownership = true;
@@ -296,8 +282,8 @@
 -  {"preserve_context", no_argument, NULL, PRESERVE_CONTEXT_OPTION},
 +  {"preserve_context", no_argument, NULL, 'P'},
    {"strip", no_argument, NULL, 's'},
+   {"strip-program", required_argument, NULL, STRIP_PROGRAM_OPTION},
    {"suffix", required_argument, NULL, 'S'},
-   {"target-directory", required_argument, NULL, 't'},
 @@ -178,6 +178,7 @@ cp_option_init (struct cp_options *x)
    x->preserve_timestamps = false;
    x->require_preserve = false;
@@ -324,7 +310,7 @@
  	  if ( ! selinux_enabled)
  	    {
 @@ -415,6 +417,10 @@ main (int argc, char **argv)
- 			     "this kernel is not SELinux-enabled."));
+ 			     "this kernel is not SELinux-enabled"));
  	      break;
  	    }
 +    if ( x.set_security_context ) {
@@ -384,8 +370,8 @@
  void usage (int status);
 +static void print_scontext_format (const struct fileinfo *f);
  
- /* The name this program was run with.  */
- char *program_name;
+ /* Initial size of hash table.
+    Most hierarchies are likely to be shallower than this.  */
 @@ -314,7 +316,7 @@ static struct pending *pending_dirs;
  
  static struct timespec current_time;
@@ -871,14 +857,18 @@
    char *format = NULL;
    bool ok = true;
  
-@@ -1040,9 +1071,13 @@ main (int argc, char *argv[])
+@@ -1040,13 +1071,13 @@ main (int argc, char *argv[])
  	  terse = true;
  	  break;
  
--	case 'Z':  /* FIXME: remove in 2010, warn in mid 2008 */
--	  /* Ignored, for compatibility with distributions
--	     that implemented this before upstream.  */
-+	case 'Z':  
+-	case 'Z':  /* FIXME: remove in 2010 */
+-	  /* Ignore, for compatibility with distributions
+-	     that implemented this before upstream.
+-	     But warn of impending removal.  */
+-	  error (0, 0,
+-		 _("the --context (-Z) option is obsolete and will be removed\n"
+-		   "in a future release"));
++	case 'Z':
 +    if((is_selinux_enabled()>0))
 +	    secure = 1;
 +	  else {


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- coreutils.spec	3 Nov 2008 11:04:32 -0000	1.235
+++ coreutils.spec	11 Nov 2008 16:03:49 -0000	1.236
@@ -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}
+Version: 7.0
+Release: 1%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -18,21 +18,14 @@
 Source203:  coreutils-runuser-l.pamd
 
 # From upstream
-Patch1: coreutils-futimensatkoji.patch
-Patch2: coreutils-authors.patch
-Patch3: coreutils-who_texinfo.patch
-Patch4: coreutils-6.12-date_timerelsnumber.patch
-Patch5: coreutils-6.12-seqdecimalutf8.patch
-Patch6: coreutils-6.12-catch-known-testsuite-failures.patch
-Patch7: coreutils-446294-lsexitstatuses.patch
+Patch1: coreutils-446294-lsexitstatuses.patch
+Patch2: coreutils-7.0-dftotal.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
 Patch101: coreutils-6.10-manpages.patch
 #Patch102: coreutils-6.10-longoptions.patch
 Patch103: coreutils-6.11-sparc-shafix.patch
-Patch104: coreutils-6.12-utimenstouchcp.patch
-Patch105: coreutils-6.12-dd-fullblock.patch
 
 # sh-utils
 Patch703: sh-utils-2.0.11-dateman.patch
@@ -60,10 +53,6 @@
 Patch951: coreutils-selinuxmanpages.patch
 Patch952: coreutils-463883-chcon-changes.patch
 
-# ls enhancements (must be applied after SELINUX patches)
-Patch954: coreutils-6.12-ls-libcap.patch
-Patch955: coreutils-6.12-ls-constant_mem.patch
-
 BuildRequires: libselinux-devel >= 1.25.6-1
 BuildRequires: libacl-devel
 BuildRequires: gettext bison
@@ -107,24 +96,21 @@
 the old GNU fileutils, sh-utils, and textutils packages.
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -c -T
+cd ..
+lzma -dc %SOURCE0 | tar xf -
+cd %name-%version
 
 # From upstream
-%patch1 -p1 -b .kojifutimensat
-%patch2 -p1 -b .authors
-%patch3 -p1 -b .whotexinfo
-%patch4 -p1 -b .getdate
-%patch5 -p1 -b .sequtf8
-%patch6 -p1 -b .tests
-%patch7 -p1 -b .lsexit
+%patch1 -p1 -b .lsexit
+%patch2 -p1 -b .dftotal
 
 # Our patches
 %patch100 -p1 -b .configure
 %patch101 -p1 -b .manpages
 #%patch102 -p1 -b .longopt
 %patch103 -p1 -b .sparc
-%patch104 -p1 -b .utimensat
-%patch105 -p1 -b .dd-fullblock
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -141,22 +127,21 @@
 %patch908 -p1 -b .getgrouplist
 %patch912 -p1 -b .overflow
 %patch915 -p1 -b .splitl
-%patch916 -p1 -b .getfacl-exit-code
+#%patch916 -p1 -b .getfacl-exit-code
 
 #SELinux
 %patch950 -p1 -b .selinux
 %patch951 -p1 -b .selinuxman
 %patch952 -p1 -b .changeonly
 
-# ls enhancements (must be applied after SELINUX patches)
-%patch954 -p1 -b .ls-libcap
-%patch955 -p1 -b .ls-constant_mem
-
-
 chmod a+x tests/misc/sort-mb-tests
 chmod a+x tests/misc/id-context
-chmod a+x tests/misc/utimensat-touchcp
-chmod a+x tests/ls/capability
+
+#Do require automake 1.10.1 instead of 1.10a
+for conffile in aclocal.m4 configure.ac configure $(find ./*/Makefile.in)
+do
+  sed -i 's/1.10a/1.10.1/' "$conffile"
+done
 
 #fix typos/mistakes in localized documentation(#439410, #440056)
 for pofile in $(find ./po/*.p*)
@@ -169,9 +154,9 @@
 %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 +324,11 @@
 /sbin/runuser
 
 %changelog
+* Tue Nov 11 2008 Ondrej Vasik <ovasik at redhat.com> - 7.0-1
+- new upstream release
+- modification/removal of related patches
+- use automake 1.10.1 instead of 1.10a
+
 * Mon Nov 03 2008 Ondrej Vasik <ovasik at redhat.com> - 6.12-17
 - Requires: ncurses (#469277)
 


--- coreutils-6.12-catch-known-testsuite-failures.patch DELETED ---


--- coreutils-6.12-date_timerelsnumber.patch DELETED ---


--- coreutils-6.12-dd-fullblock.patch DELETED ---


--- coreutils-6.12-ls-constant_mem.patch DELETED ---


--- coreutils-6.12-ls-libcap.patch DELETED ---


--- coreutils-6.12-seqdecimalutf8.patch DELETED ---


--- coreutils-6.12-utimenstouchcp.patch DELETED ---


--- coreutils-authors.patch DELETED ---


--- coreutils-futimensatkoji.patch DELETED ---


--- coreutils-who_texinfo.patch DELETED ---


