From b25b883d6d7287efbf84389fa6776be9099f4b93 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Sun, 24 Sep 2006 05:04:34 +0000 Subject: [PATCH] - fix ppmquantall (#207799), thanks to Steve Grubb --- netpbm-10.35-ppmquantall.patch | 14 ++++++++++++++ netpbm.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 netpbm-10.35-ppmquantall.patch diff --git a/netpbm-10.35-ppmquantall.patch b/netpbm-10.35-ppmquantall.patch new file mode 100644 index 0000000..bad797b --- /dev/null +++ b/netpbm-10.35-ppmquantall.patch @@ -0,0 +1,14 @@ +diff -ur netpbm-10.35.orig/editor/ppmquantall netpbm-10.35/editor/ppmquantall +--- netpbm-10.35.orig/editor/ppmquantall 2006-09-22 13:47:25.000000000 -0400 ++++ netpbm-10.35/editor/ppmquantall 2006-09-22 13:48:07.000000000 -0400 +@@ -62,8 +62,8 @@ + # To be robust, we need to use Pnmfile to get that information, or + # Put this program in C and use ppm_readppminit(). + +-set widths=() +-set heights=() ++set widths ++set heights + + for i in ${files[@]}; do + widths=(${widths[*]} `grep -v '^#' $i | sed '1d; s/ .*//; 2q'`) diff --git a/netpbm.spec b/netpbm.spec index a6ddeb9..05a2511 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 -Release: 1%{?dist} +Release: 2%{?dist} License: freeware Group: System Environment/Libraries URL: http://netpbm.sourceforge.net/ @@ -21,6 +21,7 @@ Patch11: netpbm-10.31-xwdfix.patch Patch12: netpbm-10.33-ppmtompeg.patch Patch13: netpbm-10.33-multilib.patch Patch14: netpbm-10.34-pamscale.patch +Patch15: netpbm-10.35-ppmquantall.patch Buildroot: %{_tmppath}/%{name}-root BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex BuildRequires: libX11-devel @@ -79,6 +80,7 @@ netpbm-progs. You'll also need to install the netpbm package. %patch12 -p1 -b .ppmtompeg %patch13 -p1 -b .multilib %patch14 -p1 -b .pamscale +%patch15 -p1 -b .pqall ##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile @@ -183,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT/usr/config_template %{_mandir}/man5/* %changelog +* Sun Sep 24 2006 Jindrich Novy 10.35-2 +- fix ppmquantall (#207799), thanks to Steve Grubb + * Mon Sep 18 2006 Jindrich Novy 10.35-1 - update to 10.35 - drop .pnmtopng, .rgbtxt patches, fixed upstream