diff --git a/.cvsignore b/.cvsignore index a60b0ec..d70a2a5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -netpbm-10.35.60.tar.bz2 -netpbm-10.35.61.tar.bz2 +netpbm-10.35.62.tar.bz2 diff --git a/netpbm-10.35-docfix.patch b/netpbm-10.35-docfix.patch new file mode 100644 index 0000000..cce32f5 --- /dev/null +++ b/netpbm-10.35-docfix.patch @@ -0,0 +1,57 @@ +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 "; ++ const char* const usage = "-gingham2|-g2|-gingham3|-g3|-madras|-tartan|-poles|-squig|-camo|-anticamo "; + + + 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 + + pamaddnoise -type multiplicative_gaussian + +-[-msigma value] ++[-mgsigma value] + +
+ +@@ -102,7 +102,7 @@ a plane of colors in a color space. + +
Used for laplacian noise only. The default value is 10.0. + +-
-msigma value ++
-mgsigma value + +
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. + +

The visible part must have nonzero size. That means if you specify +---frame-include=no (overriding the default), you'll need to ++--frame_include=no (overriding the default), you'll need to + specify other frame options in order to have something in the visible + part. + diff --git a/netpbm.spec b/netpbm.spec index 7dbbbfb..fa9bc31 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -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 @@ Patch26: netpbm-10.35-ppmfadeusage.patch 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 @@ netpbm-progs. You'll also need to install the netpbm package. %patch27 -p1 -b .ppmrainbowexit %patch28 -p1 -b .ppmdfontfix %patch29 -p1 -b .svgtopam +%patch30 -p1 -b .docfix %build ./configure < 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 10.35.61-2 - remove two hunks from security patch breaking pbmclean and pbmlife (#493015) - fix ppmdfont and svgtopnm, thanks to Jiri Moskovcak diff --git a/sources b/sources index c020307..1cb3dee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea6882cc00d8dc2b580184c25334ad5a netpbm-10.35.61.tar.bz2 +70617ccd4e4e2c4fdd7092ba6e004334 netpbm-10.35.62.tar.bz2