rpms/netpbm/devel netpbm-10.35-docfix.patch, NONE, 1.1 .cvsignore, 1.52, 1.53 netpbm.spec, 1.136, 1.137 sources, 1.56, 1.57

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7502

Modified Files:
	.cvsignore netpbm.spec sources 
Added Files:
	netpbm-10.35-docfix.patch 
Log Message:
* Tue Apr 14 2009 Jindrich Novy <jnovy at redhat.com> 10.35.62-1
- update to 10.35.62
- upstream fixes pamstereogram
- fix options in pamperspective, pbmtoepson, ppmpat, pamaddnoise
  so that they match their man pages (#483011, #483070, #483243, #483245)


netpbm-10.35-docfix.patch:

--- NEW FILE netpbm-10.35-docfix.patch ---
diff -up netpbm-10.35.62/converter/pbm/pbmtoepson.c.docfix netpbm-10.35.62/converter/pbm/pbmtoepson.c
--- netpbm-10.35.62/converter/pbm/pbmtoepson.c.docfix	2009-04-13 09:14:07.000000000 +0200
+++ netpbm-10.35.62/converter/pbm/pbmtoepson.c	2009-04-14 09:26:48.000000000 +0200
@@ -74,7 +74,7 @@ parseCommandLine(int                 arg
             &dpiSpec,                    0);
     OPTENT3(0, "adjacent",   OPT_FLAG,   NULL,
             &adjacentSpec,                    0);
-    OPTENT3(0, "nonadjacent",   OPT_FLAG,   NULL,
+    OPTENT3(0, "noadjacent",   OPT_FLAG,   NULL,
             &nonadjacentSpec,                    0);
 
     opt.opt_table = option_def;
diff -up netpbm-10.35.62/generator/ppmpat.c.docfix netpbm-10.35.62/generator/ppmpat.c
--- netpbm-10.35.62/generator/ppmpat.c.docfix	2009-04-13 09:13:56.000000000 +0200
+++ netpbm-10.35.62/generator/ppmpat.c	2009-04-14 09:29:35.000000000 +0200
@@ -919,7 +919,7 @@ main(int argc, char ** argv) {
 #define PAT_CAMO 7
 #define PAT_ANTICAMO 8
 #define PAT_TEST 9
-    const char* const usage = "-gingham|-g2|-gingham3|-g3|-madras|-tartan|-poles|-squig|-camo|-anticamo <width> <height>";
+    const char* const usage = "-gingham2|-g2|-gingham3|-g3|-madras|-tartan|-poles|-squig|-camo|-anticamo <width> <height>";
 
 
     ppm_init(&argc, argv);
diff -up netpbm-10.35.62/userguide/pamaddnoise.html.docfix netpbm-10.35.62/userguide/pamaddnoise.html
--- netpbm-10.35.62/userguide/pamaddnoise.html.docfix	2009-04-13 09:14:26.000000000 +0200
+++ netpbm-10.35.62/userguide/pamaddnoise.html	2009-04-14 09:32:47.000000000 +0200
@@ -38,7 +38,7 @@ pamaddnoise - add noise to a Netpbm imag
 
 <B>pamaddnoise</B> <B>-type </B> <B>multiplicative_gaussian</B>
 
-[<B>-msigma</B> <I>value</I>]
+[<B>-mgsigma</B> <I>value</I>]
 
 <BR>
 
@@ -102,7 +102,7 @@ a plane of colors in a color space.
 
 <DD>Used for laplacian noise only.  The default value is 10.0.
 
-<DT><B>-msigma</b> <i>value</i>
+<DT><B>-mgsigma</b> <i>value</i>
 
 <DD>Used for mutliplicative gaussian noise only.  The default value is
 0.5.
diff -up netpbm-10.35.62/userguide/pamperspective.html.docfix netpbm-10.35.62/userguide/pamperspective.html
--- netpbm-10.35.62/userguide/pamperspective.html.docfix	2009-04-13 09:14:26.000000000 +0200
+++ netpbm-10.35.62/userguide/pamperspective.html	2009-04-14 09:10:32.000000000 +0200
@@ -226,7 +226,7 @@ visible part is the smallest possible re
 parts specified those three ways.
 
 <p>The visible part must have nonzero size.  That means if you specify
-<b>--frame-include=no</b> (overriding the default), you'll need to
+<b>--frame_include=no</b> (overriding the default), you'll need to
 specify other frame options in order to have something in the visible
 part.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	23 Mar 2009 07:19:14 -0000	1.52
+++ .cvsignore	14 Apr 2009 10:05:34 -0000	1.53
@@ -1,2 +1 @@
-netpbm-10.35.60.tar.bz2
-netpbm-10.35.61.tar.bz2
+netpbm-10.35.62.tar.bz2


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- netpbm.spec	31 Mar 2009 14:01:09 -0000	1.136
+++ netpbm.spec	14 Apr 2009 10:05:35 -0000	1.137
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.61
-Release: 2%{?dist}
+Version: 10.35.62
+Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -38,6 +38,7 @@
 Patch27: netpbm-10.35-ppmrainbowexit.patch
 Patch28: netpbm-10.35-ppmdfontfix.patch
 Patch29: netpbm-10.35-svgtopam.patch
+Patch30: netpbm-10.35-docfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -106,6 +107,7 @@
 %patch27 -p1 -b .ppmrainbowexit
 %patch28 -p1 -b .ppmdfontfix
 %patch29 -p1 -b .svgtopam
+%patch30 -p1 -b .docfix
 
 %build
 ./configure <<EOF
@@ -231,6 +233,12 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Tue Apr 14 2009 Jindrich Novy <jnovy at redhat.com> 10.35.62-1
+- update to 10.35.62
+- upstream fixes pamstereogram
+- fix options in pamperspective, pbmtoepson, ppmpat, pamaddnoise
+  so that they match their man pages (#483011, #483070, #483243, #483245)
+
 * Tue Mar 31 2009 Jindrich Novy <jnovy at redhat.com> 10.35.61-2
 - remove two hunks from security patch breaking pbmclean and pbmlife (#493015)
 - fix ppmdfont and svgtopnm, thanks to Jiri Moskovcak


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	23 Mar 2009 07:19:15 -0000	1.56
+++ sources	14 Apr 2009 10:05:35 -0000	1.57
@@ -1 +1 @@
-ea6882cc00d8dc2b580184c25334ad5a  netpbm-10.35.61.tar.bz2
+70617ccd4e4e2c4fdd7092ba6e004334  netpbm-10.35.62.tar.bz2