diff --git a/.cvsignore b/.cvsignore index 8791e58..e92f2c0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netpbm-10.35.49.tar.bz2 +netpbm-10.35.51.tar.bz2 diff --git a/netpbm-10.35-pamcomp.patch b/netpbm-10.35-pamcomp.patch new file mode 100644 index 0000000..e1b7d9a --- /dev/null +++ b/netpbm-10.35-pamcomp.patch @@ -0,0 +1,29 @@ +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 67fe50a..e01d0e6 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.49 -Release: 2%{?dist} +Version: 10.35.51 +Release: 1%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain Group: System Environment/Libraries @@ -30,6 +30,7 @@ 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 @@ -90,6 +91,7 @@ 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 @@ -217,6 +219,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/netpbm/ %changelog +* Thu Sep 18 2008 Jindrich Novy 10.35.51-1 +- update to netpbm-10.35.51 +- make it actually compilable by removing duplicated function + in pamcomp.c + * Wed Aug 27 2008 Jindrich Novy 10.35.49-2 - link against system jasper instead of embedded one (#460300) diff --git a/sources b/sources index 4a6aca1..da81a15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00a2d821ef0d207ee85fd19032a88162 netpbm-10.35.49.tar.bz2 +f07e2e4a669fff8ea8192e7b4834d9de netpbm-10.35.51.tar.bz2