rpms/enscript/devel enscript-1.6.4-rh457719.patch, NONE, 1.1 enscript-1.6.4-rh457720.patch, NONE, 1.1 enscript-1.6.1-CAN-2004-1185.patch, 1.1, 1.2 enscript-doublefree.patch, 1.1, 1.2 enscript.spec, 1.38, 1.39

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/enscript/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13606

Modified Files:
	enscript-1.6.1-CAN-2004-1185.patch enscript-doublefree.patch 
	enscript.spec 
Added Files:
	enscript-1.6.4-rh457719.patch enscript-1.6.4-rh457720.patch 
Log Message:
- updated patches due rpm 4.6
- enscript -w is handled well (#457719)
- mkafmmap -V is handled well (#457720)


enscript-1.6.4-rh457719.patch:

--- NEW FILE enscript-1.6.4-rh457719.patch ---
diff -up enscript-1.6.4/src/main.c.rh457719 enscript-1.6.4/src/main.c
--- enscript-1.6.4/src/main.c.rh457719	2008-08-08 11:23:27.000000000 +0200
+++ enscript-1.6.4/src/main.c	2008-08-08 11:23:36.000000000 +0200
@@ -2001,7 +2001,7 @@ handle_options (int argc, char *argv[])
       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:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ",
 		       long_options, &option_index);
 
       if (c == -1)

enscript-1.6.4-rh457720.patch:

--- NEW FILE enscript-1.6.4-rh457720.patch ---
diff -up enscript-1.6.4/src/mkafmmap.c.rh457720 enscript-1.6.4/src/mkafmmap.c
--- enscript-1.6.4/src/mkafmmap.c.rh457720	2008-08-08 11:33:47.000000000 +0200
+++ enscript-1.6.4/src/mkafmmap.c	2008-08-08 11:33:58.000000000 +0200
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
       int option_index = 0;
       int c;
 
-      c = getopt_long (argc, argv, "p:h", long_options, &option_index);
+      c = getopt_long (argc, argv, "p:hV", long_options, &option_index);
       if (c == -1)
 	break;
 

enscript-1.6.1-CAN-2004-1185.patch:

Index: enscript-1.6.1-CAN-2004-1185.patch
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/enscript-1.6.1-CAN-2004-1185.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enscript-1.6.1-CAN-2004-1185.patch	29 Jan 2005 12:50:02 -0000	1.1
+++ enscript-1.6.1-CAN-2004-1185.patch	8 Aug 2008 11:31:07 -0000	1.2
@@ -1,9 +1,11 @@
---- enscript-1.6.1/src/psgen.c.CAN-2004-1185	2005-01-10 15:55:33.560648363 +0000
-+++ enscript-1.6.1/src/psgen.c	2005-01-10 15:56:30.266830723 +0000
-@@ -2210,9 +2210,10 @@
+diff -up enscript-1.6.4/src/psgen.c.CAN-2004-1185 enscript-1.6.4/src/psgen.c
+--- enscript-1.6.4/src/psgen.c.CAN-2004-1185	2008-08-08 11:18:06.000000000 +0200
++++ enscript-1.6.4/src/psgen.c	2008-08-08 11:17:57.000000000 +0200
+@@ -2386,9 +2386,11 @@ recognize_eps_file (Token *token)
    MESSAGE (2, (stderr, "^@epsf=\"%s\"\n", token->u.epsf.filename));
  
    i = strlen (token->u.epsf.filename);
++
 +  /*
    if (i > 0 && token->u.epsf.filename[i - 1] == '|')
      {
@@ -12,11 +14,11 @@
        token->u.epsf.pipe = 1;
        token->u.epsf.filename[i - 1] = '\0';
        token->u.epsf.fp = popen (token->u.epsf.filename, "r");
-@@ -2225,6 +2226,7 @@
+@@ -2401,6 +2403,7 @@ recognize_eps_file (Token *token)
  	}
      }
    else
 +  */
      {
-       /* Read EPS data from file. */
-       tilde_subst (token->u.epsf.filename, filename);
+       char *filename;
+ 

enscript-doublefree.patch:

Index: enscript-doublefree.patch
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/enscript-doublefree.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enscript-doublefree.patch	27 Sep 2004 13:37:24 -0000	1.1
+++ enscript-doublefree.patch	8 Aug 2008 11:31:07 -0000	1.2
@@ -1,10 +1,10 @@
---- enscript-1.6.1/src/main.c.doublefree	2004-09-27 14:21:29.954102199 +0100
-+++ enscript-1.6.1/src/main.c	2004-09-27 14:21:31.390828039 +0100
-@@ -1505,9 +1505,9 @@
- 	      process_file (_("Table of Contents"), &is);
+diff -up enscript-1.6.4/src/main.c.doublefree enscript-1.6.4/src/main.c
+--- enscript-1.6.4/src/main.c.doublefree	2008-08-08 11:10:07.000000000 +0200
++++ enscript-1.6.4/src/main.c	2008-08-08 11:11:51.000000000 +0200
+@@ -1714,8 +1714,9 @@ name             width\theight\tllx\tlly
  	      is_close (&is);
  	    }
--
+ 
 -	  /* Clean up toc file. */
 -	  fclose (toc_fp);
 +	  else


Index: enscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/enscript.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- enscript.spec	18 Feb 2008 20:02:26 -0000	1.38
+++ enscript.spec	8 Aug 2008 11:31:07 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A plain ASCII to PostScript converter.
 Name: enscript
 Version: 1.6.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: Applications/Publishing
 Source0: http://www.iki.fi/mtr/genscript/enscript-%{version}.tar.gz
@@ -16,6 +16,8 @@
 Patch6: enscript-1.6.1-CAN-2004-1185.patch
 Patch7: enscript-1.6.1-CAN-2004-1186.patch
 Patch8: enscript-wrap_header.patch
+Patch9: enscript-1.6.4-rh457719.patch
+Patch10:enscript-1.6.4-rh457720.patch
 URL: http://www.codento.com/people/mtr/genscript/
 Prereq: /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -37,6 +39,8 @@
 %patch6 -p1 -b .CAN-2004-1185
 %patch7 -p1 -b .CAN-2004-1186
 %patch8 -p1 -b .wrap_header
+%patch9 -p1 -b .rh457719
+%patch10 -p1 -b .rh457720
 %{__tar} -C states/hl -zxf %{SOURCE1} ruby.st
 install -pm 644 %{SOURCE2} states/hl/php.st
 
@@ -90,6 +94,11 @@
 
 
 %changelog
+* Fri Aug 08 2008 Adam Tkac <atkac redhat com> 1.6.4-10
+- updated patches due rpm 4.6
+- enscript -w is handled well (#457719)
+- mkafmmap -V is handled well (#457720)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.4-9
 - Autorebuild for GCC 4.3