rpms/netpbm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to 10.35.62

Browse Source 
- upstream fixes pamstereogram
- fix options in pamperspective, pbmtoepson, ppmpat, pamaddnoise so that
    they match their man pages (#483011, #483070, #483243, #483245)
This commit is contained in:
Jindrich Novy 2009-04-14 10:05:35 +00:00
parent d300d89c7d
commit f24a10c7bb
4 changed files with 69 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cvsignore
View File

@ -1,2 +1 @@
netpbm-10.35.60.tar.bz2
netpbm-10.35.61.tar.bz2
netpbm-10.35.62.tar.bz2

57
netpbm-10.35-docfix.patch Normal file
View File

@ -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 <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.

12
netpbm.spec
View File

@ -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 <<EOF
@ -231,6 +233,12 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/netpbm/
%changelog
* Tue Apr 14 2009 Jindrich Novy <jnovy@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@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

2
sources
View File

@ -1 +1 @@
ea6882cc00d8dc2b580184c25334ad5a netpbm-10.35.61.tar.bz2
70617ccd4e4e2c4fdd7092ba6e004334 netpbm-10.35.62.tar.bz2