From 642fb352583b7ad8fefa4fca839ece9db0f9065c Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 02:53:28 +0000
Subject: auto-import changelog data from a2ps-4.13b-36.src.rpm

Wed Mar 03 2004 Tim Waugh <twaugh@redhat.com> 4.13b-36
- Oops, use system C compiler.
Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
Tue Mar 02 2004 Tim Waugh <twaugh@redhat.com> 4.13b-35
- Prevent "error: conflicting types for 'malloc'".
Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt

---

diff --git a/a2ps-4.13-malloc.patch b/a2ps-4.13-malloc.patch
new file mode 100644
index 0000000..bdfa01c
--- /dev/null
+++ b/a2ps-4.13-malloc.patch
@@ -0,0 +1,11 @@
+--- a2ps-4.13/lib/path-concat.c.malloc	2004-03-02 11:27:49.000000000 +0000
++++ a2ps-4.13/lib/path-concat.c	2004-03-02 11:28:14.000000000 +0000
+@@ -31,7 +31,7 @@
+ #endif
+ #include <sys/types.h>
+ 
+-char *malloc ();
++#include <stdlib.h>
+ 
+ #ifndef DIRECTORY_SEPARATOR
+ # define DIRECTORY_SEPARATOR '/'
diff --git a/a2ps.spec b/a2ps.spec
index 467230f..0ba0513 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -1,5 +1,5 @@
 %define	ver	4.13b
-%define rel 33
+%define rel 36
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
@@ -27,6 +27,7 @@ Patch17: a2ps-4.13-euckr.patch
 Patch18: a2ps-4.13-gnusource.patch
 Patch19: a2ps-4.13-bison.patch
 Patch20: a2ps-4.13-hebrew.patch
+Patch21: a2ps-4.13-malloc.patch
 Requires: fileutils sh-utils info
 BuildRequires: /usr/bin/emacs, gperf
 Url: http://www.inf.enst.fr/~demaille/a2ps/
@@ -79,6 +80,9 @@ and medias.
 # Hebrew support (bug #113191).
 %patch20 -p1 -b .hebrew
 
+# Prevent "error: conflicting types for 'malloc'".
+%patch21 -p1 -b .malloc
+
 # Fix reference to a2ps binary (bug #112930).
 perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el
 libtoolize --copy --force
@@ -186,6 +190,18 @@ fi
 %dir %{_datadir}/a2ps
 
 %changelog
+* Wed Mar  3 2004 Tim Waugh <twaugh@redhat.com> 4.13b-36
+- Oops, use system C compiler.
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Mar  2 2004 Tim Waugh <twaugh@redhat.com> 4.13b-35
+- Prevent "error: conflicting types for 'malloc'".
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
 * Fri Jan 16 2004 Tim Waugh <twaugh@redhat.com> 4.13b-33
 - Post scriptlet requires sed, coreutils (bug #107322).