From 67e264c1422e0aeda3e15bc35b529f1281b2083c Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Mon, 25 May 2009 12:11:34 +0000
Subject: [PATCH] new upstream release 7.4, removed applied patches

---
 .cvsignore                    |  2 +-
 coreutils-5.2.1-runuser.patch |  6 +++---
 coreutils-selinux.patch       | 20 +++-----------------
 coreutils.spec                | 15 +++++----------
 sources                       |  2 +-
 5 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c47163f..7cd2c15 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-coreutils-7.2.tar.gz
+coreutils-7.4.tar.gz
diff --git a/coreutils-5.2.1-runuser.patch b/coreutils-5.2.1-runuser.patch
index 6ff3085..d88def4 100644
--- a/coreutils-5.2.1-runuser.patch
+++ b/coreutils-5.2.1-runuser.patch
@@ -1,14 +1,14 @@
 diff -urNp coreutils-7.0.orig/AUTHORS coreutils-7.0/AUTHORS
 --- coreutils-7.0.orig/AUTHORS	2008-08-24 22:58:15.000000000 +0200
 +++ coreutils-7.0/AUTHORS	2009-01-28 18:11:00.316247411 +0100
-@@ -63,6 +63,7 @@ pwd: Jim Meyering
- readlink: Dmitry V. Levin
+@@ -64,6 +64,7 @@ pwd: Jim Meyering
  rm: Paul Rubin, David MacKenzie, Richard M. Stallman, Jim Meyering
  rmdir: David MacKenzie
-+runuser: David MacKenzie, Dan Walsh
  runcon: Russell Coker
++runuser: David MacKenzie, Dan Walsh
  seq: Ulrich Drepper
  sha1sum: Ulrich Drepper, Scott Miller, David Madore
+ sha224sum: Ulrich Drepper, Scott Miller, David Madore
 diff -urNp coreutils-7.0.orig/man/Makefile.am coreutils-7.0/man/Makefile.am
 --- coreutils-7.0.orig/man/Makefile.am	2008-09-27 19:28:54.000000000 +0200
 +++ coreutils-7.0/man/Makefile.am	2009-01-28 18:11:00.317247417 +0100
diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch
index 247a879..21bd492 100644
--- a/coreutils-selinux.patch
+++ b/coreutils-selinux.patch
@@ -177,20 +177,6 @@ diff -urNp coreutils-7.1-orig/src/id.c coreutils-7.1/src/id.c
 diff -urNp coreutils-7.1-orig/src/install.c coreutils-7.1/src/install.c
 --- coreutils-7.1-orig/src/install.c	2009-02-18 15:32:52.000000000 +0100
 +++ coreutils-7.1/src/install.c	2009-02-24 13:47:15.000000000 +0100
-@@ -157,11 +157,11 @@ static struct option const long_options[
-   {"no-target-directory", no_argument, NULL, 'T'},
-   {"owner", required_argument, NULL, 'o'},
-   {"preserve-timestamps", no_argument, NULL, 'p'},
--  {"preserve-context", no_argument, NULL, PRESERVE_CONTEXT_OPTION},
-+  {"preserve-context", no_argument, NULL, 'P'},
-   /* Continue silent support for --preserve_context until Jan 2008. FIXME-obs
-      After that, FIXME-obs: warn in, say, late 2008, and disable altogether
-      a year or two later.  */
--  {"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'},
 @@ -292,6 +292,7 @@ cp_option_init (struct cp_options *x)
    x->reduce_diagnostics=false;
    x->require_preserve = false;
@@ -209,9 +195,9 @@ diff -urNp coreutils-7.1-orig/src/install.c coreutils-7.1/src/install.c
      {
        switch (optc)
 @@ -539,6 +540,7 @@ main (int argc, char **argv)
- 	  no_target_directory = true;
- 	  break;
- 
+ 	  error (0, 0, _("WARNING: --preserve_context is deprecated; "
+ 			 "use --preserve-context instead"));
+ 	  /* fall through */
 +  case 'P':
  	case PRESERVE_CONTEXT_OPTION:
  	  if ( ! selinux_enabled)
diff --git a/coreutils.spec b/coreutils.spec
index d3a1908..88254a5 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
-Version: 7.2
-Release: 3%{?dist}
+Version: 7.4
+Release: 1%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -49,9 +49,6 @@ Patch916: coreutils-getfacl-exit-code.patch
 Patch950: coreutils-selinux.patch
 Patch951: coreutils-selinuxmanpages.patch
 
-Patch960: coreutils-silentmv.patch
-
-
 BuildRequires: libselinux-devel >= 1.25.6-1
 BuildRequires: libacl-devel
 BuildRequires: gettext bison
@@ -127,13 +124,8 @@ the old GNU fileutils, sh-utils, and textutils packages.
 %patch950 -p1 -b .selinux
 %patch951 -p1 -b .selinuxman
 
-%patch960 -p1 -b .silentmv
-
 chmod a+x tests/misc/sort-mb-tests
 
-sed -i 's/1.10a/1.10.1/' configure.ac
-sed -i 's/dist-xz/dist-lzma/' configure.ac
-
 #fix typos/mistakes in localized documentation(#439410, #440056)
 find ./po/ -name "*.p*" | xargs \
  sed -i \
@@ -314,6 +306,9 @@ fi
 /sbin/runuser
 
 %changelog
+* Mon May 25 2009 Ondrej Vasik <ovasik@redhat.com> 7.4-1
+- new upstream release 7.4, removed applied patches
+
 * Thu Apr 23 2009 Ondrej Vasik <ovasik@redhat.com> 7.2-3
 - fix segfaults in join (i18n patch) when using multibyte
   locales(#497368)
diff --git a/sources b/sources
index a167571..1df53be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-427c2914d3eab956f317c9ec6a45e62a  coreutils-7.2.tar.gz
+c52f4f64dda9a245c38e74c09fdd86d2  coreutils-7.4.tar.gz