rpms/netpbm/devel netpbm-cmuwtopbm.patch, NONE, 1.1 netpbm-pamtojpeg2k.patch, NONE, 1.1 netpbm-docfix.patch, 1.1, 1.2 netpbm.spec, 1.162, 1.163
Jindrich Novy
jnovy at fedoraproject.org
Mon May 3 14:05:07 UTC 2010
Author: jnovy
Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11244
Modified Files:
netpbm-docfix.patch netpbm.spec
Added Files:
netpbm-cmuwtopbm.patch netpbm-pamtojpeg2k.patch
Log Message:
* Mon May 3 2010 Jindrich Novy <jnovy at redhat.com> 10.47.12-3
- fix cmuwtopbm so that magic bytes test actually works
- fix pamtojpeg2k (don't close stdout twice)
- fix documentation for pamperspective and pbmtoepson
netpbm-cmuwtopbm.patch:
cmuwmtopbm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE netpbm-cmuwtopbm.patch ---
diff -up netpbm-10.47.12/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix netpbm-10.47.12/converter/pbm/cmuwmtopbm.c
--- netpbm-10.47.12/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix 2010-04-27 15:47:14.000000000 +0200
+++ netpbm-10.47.12/converter/pbm/cmuwmtopbm.c 2010-05-03 15:17:06.081277896 +0200
@@ -18,7 +18,7 @@
This program does not check the pad bits at the end of each row.
*/
-
+#include <stdint.h>
#include "pbm.h"
#include "cmuwm.h"
@@ -33,7 +33,7 @@ readCmuwmHeader(FILE * const ifP
const char * const initReadError =
"CMU window manager header EOF / read error";
- long l;
+ uint32_t l;
short s;
int rc;
netpbm-pamtojpeg2k.patch:
pamtojpeg2k.c | 2 --
1 file changed, 2 deletions(-)
--- NEW FILE netpbm-pamtojpeg2k.patch ---
diff -up netpbm-10.47.12/converter/other/jpeg2000/pamtojpeg2k.c.pamtojpeg2kfix netpbm-10.47.12/converter/other/jpeg2000/pamtojpeg2k.c
--- netpbm-10.47.12/converter/other/jpeg2000/pamtojpeg2k.c.pamtojpeg2kfix 2010-04-27 15:47:10.000000000 +0200
+++ netpbm-10.47.12/converter/other/jpeg2000/pamtojpeg2k.c 2010-05-03 15:37:49.934269588 +0200
@@ -518,7 +518,5 @@ main(int argc, char **argv)
pm_close(ifP);
- pm_close(stdout);
-
return 0;
}
netpbm-docfix.patch:
netpbm-10.35.58/converter/pbm/pbmtoepson.c | 2 +-
netpbm-10.35.58/userguide/cameratopam.html | 10 +++++-----
netpbm-10.35.58/userguide/fiascotopnm.html | 12 ++++--------
netpbm-10.47.12/userguide/pamperspective.html | 2 +-
netpbm-10.47.12/userguide/pbmtoepson.html | 4 ++--
5 files changed, 13 insertions(+), 17 deletions(-)
Index: netpbm-docfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm-docfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netpbm-docfix.patch 25 Jan 2010 08:42:36 -0000 1.1
+++ netpbm-docfix.patch 3 May 2010 14:05:02 -0000 1.2
@@ -89,3 +89,36 @@ diff -up netpbm-10.35.58/userguide/fiasc
</DL>
+diff -up netpbm-10.47.12/userguide/pamperspective.html.docfix netpbm-10.47.12/userguide/pamperspective.html
+--- netpbm-10.47.12/userguide/pamperspective.html.docfix 2010-04-27 15:48:09.000000000 +0200
++++ netpbm-10.47.12/userguide/pamperspective.html 2010-05-03 14:16:26.064266675 +0200
+@@ -220,7 +220,7 @@ default rectangle as the "frame.&qu
+ a rectangle the axes of which are parallel to those of the frame.
+
+ <p>The frame options are additive. All the parts of the image
+-specified by either margin options, <b>--include_frame</b>, or
++specified by either margin options, <b>--frame_include</b>, or
+ <b>--include</b> (or their defaults) are in the visible part. The
+ visible part is the smallest possible rectangle that contains the
+ parts specified those three ways.
+diff -up netpbm-10.47.12/userguide/pbmtoepson.html.docfix netpbm-10.47.12/userguide/pbmtoepson.html
+--- netpbm-10.47.12/userguide/pbmtoepson.html.docfix 2010-04-27 15:48:09.000000000 +0200
++++ netpbm-10.47.12/userguide/pbmtoepson.html 2010-05-03 14:34:03.571141020 +0200
+@@ -18,7 +18,7 @@ pbmtoepson - convert a PBM image into Ep
+ [<b>-dpi=</b><i>n</i>]
+ [<b>-protocol=</b>{<b>escp9</b>|<B>escp</B>}]
+ [<b>-adjacent</b>]
+-[<b>-nonadjacent</b>]
++[<b>-noadjacent</b>]
+
+ [<I>pbmfile</I>]
+
+@@ -74,7 +74,7 @@ print density for you consistent with yo
+ <p>This option was new in Netpbm 10.23 (July 2004).
+
+ <dt><b>-adjacent</b>
+-<dt><b>-nonadjacent</b>
++<dt><b>-noadjacent</b>
+
+ <dd>These options determine whether the output uses "adjacent dot
+ printing" or not, whatever that is.
Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- netpbm.spec 28 Apr 2010 12:28:21 -0000 1.162
+++ netpbm.spec 3 May 2010 14:05:02 -0000 1.163
@@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats
Name: netpbm
Version: 10.47.12
-Release: 2%{?dist}
+Release: 3%{?dist}
# See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain
Group: System Environment/Libraries
@@ -31,6 +31,8 @@ Patch17: netpbm-fiasco-overflow.patch
Patch18: netpbm-lz.patch
Patch19: netpbm-pnmmontagefix.patch
Patch20: netpbm-noppmtompeg.patch
+Patch21: netpbm-cmuwtopbm.patch
+Patch22: netpbm-pamtojpeg2k.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel, python, jasper-devel
@@ -104,6 +106,8 @@ netpbm-doc. You'll also need to install
%patch18 -p1 -b .lz
%patch19 -p1 -b .pnmmmontagefix
%patch20 -p1 -b .noppmtompeg
+%patch21 -p1 -b .cmuwtopbmfix
+%patch22 -p1 -b .pamtojpeg2kfix
sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
rm -rf converter/other/jpeg2000/libjasper/
@@ -247,6 +251,11 @@ rm -rf $RPM_BUILD_ROOT
%doc userguide/*
%changelog
+* Mon May 3 2010 Jindrich Novy <jnovy at redhat.com> 10.47.12-3
+- fix cmuwtopbm so that magic bytes test actually works
+- fix pamtojpeg2k (don't close stdout twice)
+- fix documentation for pamperspective and pbmtoepson
+
* Wed Apr 28 2010 Jindrich Novy <jnovy at redhat.com> 10.47.12-2
- fix CVE-2007-2721 (#501451)
- add missing man pages
More information about the scm-commits
mailing list