From b2810cd12a1983caff4e404fecbc8d7390677deb Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 02:52:47 +0000
Subject: auto-import changelog data from a2ps-4.13b-30.src.rpm

Fri Oct 17 2003 Tim Waugh <twaugh@redhat.com> 4.13b-30
- Prevent strsignal segfaulting (bug #104970).
Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt

---

diff --git a/a2ps-4.13-gnusource.patch b/a2ps-4.13-gnusource.patch
new file mode 100644
index 0000000..5e75fbb
--- /dev/null
+++ b/a2ps-4.13-gnusource.patch
@@ -0,0 +1,18 @@
+--- a2ps-4.13/src/main.c.gnusource	2003-10-17 17:07:05.000000000 +0100
++++ a2ps-4.13/src/main.c	2003-10-17 17:07:17.000000000 +0100
+@@ -30,6 +30,7 @@
+ /*                      I n c l u d e   f i l e s                       */
+ /*                                                                      */
+ /************************************************************************/
++#define _GNU_SOURCE
+ #include <assert.h>
+ #include <string.h>
+ #include <langinfo.h>
+@@ -105,7 +106,6 @@
+    defined twice, see lib/confg.gperf, handling of `Options:'. */
+ 
+ char *program_name;
+-const char *program_invocation_name;
+ 
+ /* Stores the data of liba2ps.  */
+ 
diff --git a/a2ps.spec b/a2ps.spec
index 4e277fc..ac12db5 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -1,5 +1,5 @@
 %define	ver	4.13b
-%define rel 28
+%define rel 30
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
@@ -24,6 +24,7 @@ Patch14: a2ps-4.13b-encoding.patch
 Patch15: a2ps-4.13b-tilde.patch
 Patch16: a2ps-4.13b-rm.patch
 Patch17: a2ps-4.13-euckr.patch
+Patch18: a2ps-4.13-gnusource.patch
 Requires: fileutils sh-utils info
 Buildrequires: /usr/bin/emacs
 Url: http://www.inf.enst.fr/~demaille/a2ps/
@@ -66,6 +67,9 @@ and medias.
 # Add Korean resource file (bug #81421).
 %patch17 -p1 -b .euckr
 
+# Prevent strsignal segfaulting (bug #104970).
+%patch18 -p1 -b .gnusource
+
 libtoolize --copy --force
 
 %build
@@ -95,7 +99,7 @@ find src lib -name '*.l' -exec touch {} \;
     /bin/sh ../auxdir/ylwrap "flex" lexppd.l lex.yy.c lexppd.c --
 )
 
-make
+make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -171,6 +175,12 @@ fi
 %dir %{_datadir}/a2ps
 
 %changelog
+* Fri Oct 17 2003 Tim Waugh <twaugh@redhat.com> 4.13b-30
+- Prevent strsignal segfaulting (bug #104970).
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
 * Wed Jan 22 2003 Tim Powers <timp@redhat.com>
 - rebuilt