From 75996892480bb8e493222381b358727c2065eb08 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 29 Apr 2005 15:42:30 +0000
Subject: [PATCH] - Applied patch from Toshio Kuratomi to avoid problems with
 DOS-format     newlines (bug #154283).

---
 patch-stripcr.patch | 10 ++++++++++
 patch.spec          |  8 +++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 patch-stripcr.patch

diff --git a/patch-stripcr.patch b/patch-stripcr.patch
new file mode 100644
index 0000000..7b4a617
--- /dev/null
+++ b/patch-stripcr.patch
@@ -0,0 +1,10 @@
+--- 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;
diff --git a/patch.spec b/patch.spec
index 9be0a97..fdb5d40 100644
--- a/patch.spec
+++ b/patch.spec
@@ -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 @@ Patch2: patch-2.5.4-suffix.patch
 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 @@ applications.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Fri Apr 29 2005 Tim Waugh <twaugh@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@redhat.com> 2.5.4-22
 - Rebuild for new GCC.