rpms/patch/devel patch-stripcr.patch,NONE,1.1 patch.spec,1.13,1.14

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/patch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23872

Modified Files:
	patch.spec 
Added Files:
	patch-stripcr.patch 
Log Message:
* Fri Apr 29 2005 Tim Waugh <twaugh at redhat.com> 2.5.4-23
- Applied patch from Toshio Kuratomi to avoid problems with DOS-format
  newlines (bug #154283).


patch-stripcr.patch:
 pch.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE patch-stripcr.patch ---
--- patch-2.5.4/pch.c.stripcr	1999-08-30 07:20:08.000000000 +0100
+++ patch-2.5.4/pch.c	2005-04-29 16:39:40.000000000 +0100
@@ -419,7 +419,6 @@
 	    if (s[0] == '+' && s[1] == '0' && !ISDIGIT (s[2]))
 	      p_says_nonexistent[NEW] = 1 + ! p_timestamp[NEW];
 	    p_indent = indent;
-	    p_strip_trailing_cr = strip_trailing_cr;
 	    p_start = this_line;
 	    p_sline = p_input_line;
 	    retval = UNI_DIFF;


Index: patch.spec
===================================================================
RCS file: /cvs/dist/rpms/patch/devel/patch.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- patch.spec	2 Mar 2005 15:07:53 -0000	1.13
+++ patch.spec	29 Apr 2005 15:42:30 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: The GNU patch command, for modifying/upgrading files.
 Name: patch
 Version: 2.5.4
-Release: 22
+Release: 23
 License: GPL
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -11,6 +11,7 @@
 Patch3: patch-2.5.4-sigsegv.patch
 Patch4: patch-2.5.4-ifdef.patch
 Patch5: patch-2.5.4-program_name.patch
+Patch6: patch-stripcr.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -30,6 +31,7 @@
 %patch3 -p1 -b .sigsegv
 %patch4 -p1 -b .ifdef
 %patch5 -p1 -b .program_name
+%patch6 -p1 -b .stripcr
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -56,6 +58,10 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Apr 29 2005 Tim Waugh <twaugh at redhat.com> 2.5.4-23
+- Applied patch from Toshio Kuratomi to avoid problems with DOS-format
+  newlines (bug #154283).
+
 * Wed Mar  2 2005 Tim Waugh <twaugh at redhat.com> 2.5.4-22
 - Rebuild for new GCC.