rpms/coreutils/devel coreutils-6.10-longoptions.patch, 1.1, 1.2 coreutils.spec, 1.199, 1.200

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17172

Modified Files:
	coreutils-6.10-longoptions.patch coreutils.spec 
Log Message:
revert echo behaviour changes not accepted by upstream

coreutils-6.10-longoptions.patch:

Index: coreutils-6.10-longoptions.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-longoptions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coreutils-6.10-longoptions.patch	31 Jan 2008 15:55:47 -0000	1.1
+++ coreutils-6.10-longoptions.patch	17 Mar 2008 11:44:11 -0000	1.2
@@ -1,17 +1,3 @@
-diff -urp coreutils-6.10-orig/src/echo.c coreutils-6.10/src/echo.c
---- coreutils-6.10-orig/src/echo.c	2007-11-25 14:23:31.000000000 +0100
-+++ coreutils-6.10/src/echo.c	2008-01-31 14:01:52.000000000 +0100
-@@ -163,6 +163,10 @@ main (int argc, char **argv)
- 	    {
- 	    case 'e': case 'E': case 'n':
- 	      break;
-+     case '-':
-+      /* end of short options(allows to print -n,-e or -E) */
-+      argc--;
-+      argv++; 
- 	    default:
- 	      goto just_echo;
- 	    }
 diff -urp coreutils-6.10-orig/lib/long-options.c coreutils-6.10/lib/long-options.c
 --- coreutils-6.10-orig/lib/long-options.c	2007-10-17 15:47:26.000000000 +0200
 +++ coreutils-6.10/lib/long-options.c	2008-01-31 14:28:01.000000000 +0100


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- coreutils.spec	11 Mar 2008 12:26:21 -0000	1.199
+++ coreutils.spec	17 Mar 2008 11:44:11 -0000	1.200
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 6.10
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -25,7 +25,7 @@
 Patch100: coreutils-chgrp.patch
 Patch101: coreutils-6.10-configuration.patch
 Patch102: coreutils-6.10-manpages.patch
-Patch103: coreutils-6.10-longoptions.patch
+#Patch103: coreutils-6.10-longoptions.patch
 
 # sh-utils
 Patch703: sh-utils-2.0.11-dateman.patch
@@ -104,7 +104,7 @@
 %patch100 -p1 -b .chgrp
 %patch101 -p1 -b .configure
 %patch102 -p1 -b .manpages
-%patch103 -p1 -b .longopt
+#%patch103 -p1 -b .longopt
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -295,6 +295,12 @@
 /sbin/runuser
 
 %changelog
+* Mon Mar 17 2008 Ondrej Vasik <ovasik at redhat.com> - 6.10-13
+- disable echo option separator behavior(added by #431005,
+  request for removal #437653 + upstream)
+- temporarily disabled longoptions change until full 
+  clarification upstreamery (#431005)
+
 * Tue Mar 11 2008 Ondrej Vasik <ovasik at redhat.com> - 6.10-12
 - fixed harmless double close of stdout in dd(#436368)