From 7f24b84ff7c125a3f004e8b9e238baf952fa4d71 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Dec 15 2008 09:36:08 +0000
Subject: - update to 10.35.57


---

diff --git a/.cvsignore b/.cvsignore
index 434ddb9..efe2b00 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-netpbm-10.35.55.tar.bz2
+netpbm-10.35.57.tar.bz2
diff --git a/netpbm-10.35-pamcomp.patch b/netpbm-10.35-pamcomp.patch
deleted file mode 100644
index e1b7d9a..0000000
--- a/netpbm-10.35-pamcomp.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up netpbm-10.35.51/editor/pamcomp.c.pamcomp netpbm-10.35.51/editor/pamcomp.c
---- netpbm-10.35.51/editor/pamcomp.c.pamcomp	2008-09-18 13:45:15.000000000 +0200
-+++ netpbm-10.35.51/editor/pamcomp.c	2008-09-18 14:03:19.000000000 +0200
-@@ -325,25 +325,6 @@ validateComputableHeight(int const origi
- 
- 
- static void
--validateComputableHeight(int const originTop, 
--                         int const overRows) {
--
--    if (originTop < 0) {
--        if (originTop < -INT_MAX)
--            pm_error("Overlay starts too far above the underlay image to be "
--                     "computable.  Overlay can be at most %d rows above "
--                     "the underlay.", INT_MAX);
--    } else {
--        if (INT_MAX - originTop <= overRows)
--            pm_error("Too many total rows involved to be computable.  "
--                     "You must have a shorter overlay image or compose it "
--                     "higher on the underlay image.");
--    }
--}
--
--
--
--static void
- computeOverlayPosition(int                const underCols, 
-                        int                const underRows,
-                        int                const overCols, 
diff --git a/netpbm.spec b/netpbm.spec
index f393c5a..baa4457 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.55
+Version: 10.35.57
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -30,7 +30,6 @@ Patch17: netpbm-10.35-pbmtomacp.patch
 Patch18: netpbm-10.35-glibc.patch
 Patch19: netpbm-10.35-gcc43.patch
 Patch20: netpbm-10.35-rgbtxt.patch
-Patch21: netpbm-10.35-pamcomp.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -91,7 +90,6 @@ netpbm-progs.  You'll also need to install the netpbm package.
 %patch18 -p1 -b .glibc
 %patch19 -p1 -b .gcc43
 %patch20 -p1 -b .rgbtxt
-%patch21 -p1 -b .pamcomp
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -219,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Mon Dec 15 2008 Jindrich Novy <jnovy@redhat.com> 10.35.57-1
+- update to 10.35.57
+
 * Thu Nov  6 2008 Jindrich Novy <jnovy@redhat.com> 10.35.55-1
 - update to 10.35.55
 
diff --git a/sources b/sources
index 951341b..8a68d1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d470a6472b3b49ecbc98e516d6d206c  netpbm-10.35.55.tar.bz2
+185a849a620efed4d540fef313c07774  netpbm-10.35.57.tar.bz2