- update to 10.29

- drop upstreamed .libpm, .pnmtojpeg, .pbmtolj patches
- update .CAN-2005-2471 patch
- regenerate man pages

.cvsignore

@@ -10,3 +10,5 @@ netpbm-10.27.tar.bz2
 netpbmdoc-10.27.tar.bz2
 netpbm-10.28.tar.bz2
 netpbmdoc-10.28.tar.bz2
+netpbm-10.29.tar.bz2
+netpbmdoc-10.29.tar.bz2

netpbm-10.28-CAN-2005-2471.patch

@@ -1,18 +1,15 @@
---- netpbm-10.28/converter/other/pstopnm.c.CAN-2005-2471	2004-06-23 04:22:33.000000000 +0200
+--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471	2005-08-15 02:39:46.000000000 +0200
-+++ netpbm-10.28/converter/other/pstopnm.c	2005-08-09 08:41:42.000000000 +0200
++++ netpbm-10.29/converter/other/pstopnm.c	2005-08-16 15:38:15.000000000 +0200
-@@ -702,13 +702,13 @@
+@@ -711,11 +711,11 @@
- 
+                    "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'",
-     if (verbose) {
-         pm_message("execing '%s' with args '%s' (arg 0), "
--                   "'%s', '%s', '%s', '%s', '%s', '%s', '%s'",
-+                   "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'",
                     ghostscriptProg, arg0,
--                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-");
+                    deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", 
-+                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-dPARANOIDSAFER", "-");
+-                   "-dSAFER", "-");
++                   "-dPARANOIDSAFER", "-");
      }
  
      execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
--          "-dNOPAUSE", "-", NULL);
+-          "-dNOPAUSE", "-dSAFER", "-", NULL);
 +          "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
      
      pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",

netpbm.spec

@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
-Version: 10.28
+Version: 10.29
-Release: 6
+Release: 1
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -18,10 +18,7 @@ Patch7: netpbm-10.23-security.patch
 Patch8: netpbm-10.24-nodoc.patch
 Patch9: netpbm-10.28-gcc4.patch
 Patch10: netpbm-10.27-bmptopnm.patch
-Patch11: netpbm-10.27-libpm.patch
+Patch11: netpbm-10.28-CAN-2005-2471.patch
-Patch12: netpbm-10.27-pnmtojpeg.patch
-Patch13: netpbm-10.28-pbmtolj.patch
-Patch14: netpbm-10.28-CAN-2005-2471.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
 Obsoletes: libgr
@@ -76,10 +73,7 @@ netpbm-progs.  You'll also need to install the netpbm package.
 %patch8 -p1 -b .nodoc
 %patch9 -p1 -b .gcc4
 %patch10 -p1 -b .bmptopnm
-%patch11 -p1 -b .libpm
+%patch11 -p1 -b .CAN-2005-2471
-%patch12 -p1 -b .pnmtojpeg
-%patch13 -p1 -b .pbmtolj
-%patch14 -p1 -b .CAN-2005-2471
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -178,6 +172,12 @@ rm -rf $RPM_BUILD_ROOT/usr/config_template
 %{_mandir}/man5/*
 
 %changelog
+* Tue Aug 16 2005 Jindrich Novy <jnovy@redhat.com> 10.29-1
+- update to 10.29
+- drop upstreamed .libpm, .pnmtojpeg, .pbmtolj patches
+- update .CAN-2005-2471 patch
+- regenerate man pages
+
 * Mon Aug 15 2005 Jindrich Novy <jnovy@redhat.com> 10.28-6
 - link libnetpbm.so against -lm (#165980)
 

sources

@@ -1,2 +1,2 @@
-f1b766be9e0ba2470f762ee0717b834f  netpbm-10.28.tar.bz2
+51bd472bde201b3dad0bccfb8c6bf47e  netpbm-10.29.tar.bz2
-41f281d183afded0118f2fde2b8b79f1  netpbmdoc-10.28.tar.bz2
+21c6d8ba70222b1afdddcdffe6517bdc  netpbmdoc-10.29.tar.bz2