From c9808c3bd74f256b40ec80fa3d65dbda06bbe669 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 09:54:49 +0000
Subject: [PATCH] auto-import changelog data from patch-2.5.4-12.src.rpm Tue
 Apr 09 2002 Tim Waugh <twaugh@redhat.com> 2.5.4-12 - Fix error reporting when
 given bad options (bug #62981).

---
 patch-2.5.4-program_name.patch | 11 +++++++++++
 patch.spec                     |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 patch-2.5.4-program_name.patch

diff --git a/patch-2.5.4-program_name.patch b/patch-2.5.4-program_name.patch
new file mode 100644
index 0000000..5447839
--- /dev/null
+++ b/patch-2.5.4-program_name.patch
@@ -0,0 +1,11 @@
+--- patch-2.5.4/error.c.program_name	Tue Apr  9 14:38:27 2002
++++ patch-2.5.4/error.c	Tue Apr  9 14:38:43 2002
+@@ -80,7 +80,7 @@
+ 
+ /* The calling program should define program_name and set it to the
+    name of the executing program.  */
+-extern char *program_name;
++extern char const program_name[];
+ 
+ # ifdef HAVE_STRERROR_R
+ #  define __strerror_r strerror_r
diff --git a/patch.spec b/patch.spec
index e1d39cc..9d2581c 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: 11
+Release: 12
 License: GPL
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -10,6 +10,7 @@ Patch1: patch-2.5-stderr.patch
 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
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -28,6 +29,7 @@ applications.
 %patch2 -p1 -b .suffix
 %patch3 -p1 -b .sigsegv
 %patch4 -p1 -b .ifdef
+%patch5 -p1 -b .program_name
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Tue Apr  9 2002 Tim Waugh <twaugh@redhat.com> 2.5.4-12
+- Fix error reporting when given bad options (bug #62981).
+
 * Tue Mar  5 2002 Tim Waugh <twaugh@redhat.com> 2.5.4-11
 - s/Copyright:/License:/.
 - Fix -D behaviour (bug #60688).