From 521af1422df92b47a237dc1c53effacd1702380e Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 1 Oct 2012 19:04:56 +0200
Subject: [PATCH] - updated to 1.6.6 - updated mail patch - added ac patch
 (adjust for dropped AM_C_PROTOTYPES support)

---
 enscript-ac.patch   | 11 +++++++++++
 enscript-mail.patch | 18 +++++++++---------
 enscript.spec       |  6 ++++--
 3 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 enscript-ac.patch

diff --git a/enscript-ac.patch b/enscript-ac.patch
new file mode 100644
index 0000000..438c34e
--- /dev/null
+++ b/enscript-ac.patch
@@ -0,0 +1,11 @@
+--- enscript-1.6.6/configure.ac.orig	2012-09-30 21:24:45.567496718 +0200
++++ enscript-1.6.6/configure.ac	2012-09-30 21:41:38.907475597 +0200
+@@ -11,7 +11,7 @@
+ AC_PROG_CC
+ 
+ AC_USE_SYSTEM_EXTENSIONS
+-AM_C_PROTOTYPES
++CPPFLAGS="$CPPFLAGS -DPROTOTYPES"
+ 
+ AC_C_CONST
+ AC_FUNC_ALLOCA
diff --git a/enscript-mail.patch b/enscript-mail.patch
index 11105ae..048882e 100644
--- a/enscript-mail.patch
+++ b/enscript-mail.patch
@@ -1,6 +1,6 @@
---- enscript-1.6.1/src/main.c.mail	Thu Jun 25 04:26:00 1998
-+++ enscript-1.6.1/src/main.c	Tue Jun 26 01:05:49 2001
-@@ -338,6 +338,8 @@
+--- enscript-1.6.6/src/main.c.orig	2011-10-30 17:48:42.000000000 +0100
++++ enscript-1.6.6/src/main.c	2012-09-30 21:24:10.177497456 +0200
+@@ -329,6 +329,8 @@
   * Send mail notification to user after print job has been completed.
   */
  int mail = 0;
@@ -9,7 +9,7 @@
  
  /*
   * -M, --media
-@@ -785,7 +787,7 @@
+@@ -848,7 +850,7 @@
    {"no-page-prefeed",		no_argument,		0, 'K'},
    {"lineprinter",		no_argument,		0, 'l'},
    {"lines-per-page",		required_argument,	0, 'L'},
@@ -18,7 +18,7 @@
    {"media",			required_argument,	0, 'M'},
    {"copies",			required_argument,	0, 'n'},
    {"newline",			required_argument,	0, 'N'},
-@@ -1637,7 +1639,11 @@
+@@ -1843,7 +1845,11 @@
        /* Format spooler options. */
        spooler_options[0] = '\0';
        if (mail)
@@ -31,16 +31,16 @@
        if (no_job_header)
  	{
  	  strcat (spooler_options, no_job_header_switch);
-@@ -1797,7 +1803,7 @@
+@@ -2006,7 +2012,7 @@
        int i;
  
        c = getopt_long (argc, argv,
--		       "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ",
-+		       "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:m::M:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ",
+-		       "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ",
++		       "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:m::M:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ",
  		       long_options, &option_index);
  
        if (c == -1)
-@@ -1985,6 +1991,10 @@
+@@ -2207,6 +2213,10 @@
  
  	case 'm':		/* send mail upon completion */
  	  mail = 1;
diff --git a/enscript.spec b/enscript.spec
index e7520e3..61c2511 100644
--- a/enscript.spec
+++ b/enscript.spec
@@ -6,16 +6,17 @@ Summary(es.UTF-8):	Convierte texto ASCII a postscript
 Summary(pl.UTF-8):	Konwertuje czyste ASCII do PostScriptu
 Summary(pt_BR.UTF-8):	Converte texto ASCII para postscript
 Name:		enscript
-Version:	1.6.5.2
+Version:	1.6.6
 Release:	1
 License:	GPL v3+
 Group:		Applications/Publishing
 Source0:	http://ftp.gnu.org/gnu/enscript/%{name}-%{version}.tar.gz
-# Source0-md5:	c1d2a0d4b44ca30634742b299881b0e2
+# Source0-md5:	3acc242b829adacabcaf28533f049afd
 Patch0:		%{name}-mail.patch
 Patch1:		%{name}-debian.patch
 Patch2:		%{name}-info.patch
 Patch3:		%{name}-php.patch
+Patch4:		%{name}-ac.patch
 URL:		http://www.gnu.org/software/enscript/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
@@ -52,6 +53,7 @@ página física (lado a lado) ou modificar as fontes do texto.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__gettextize}
-- 
2.43.0