diff --git a/netpbm-10.35-glibc.patch b/netpbm-10.35-glibc.patch new file mode 100644 index 0000000..4ae71e8 --- /dev/null +++ b/netpbm-10.35-glibc.patch @@ -0,0 +1,13 @@ +--- netpbm-10.35/converter/other/pnmtotiffcmyk.c.glibc 2006-09-18 12:20:06.000000000 +0200 ++++ netpbm-10.35/converter/other/pnmtotiffcmyk.c 2007-08-23 09:18:30.000000000 +0200 +@@ -974,8 +974,8 @@ int main( int argc, char **argv ) { + + if ( (err = parseOpts( argc, argv, rt )) ) goto exit ; + +- if ( (err = rt->in->open( rt->in, rt )) ) goto exit ; +- if ( (err = rt->out->open( rt->out, rt )) ) goto exit ; ++ if ( (err = (rt->in->open)( rt->in, rt )) ) goto exit ; ++ if ( (err = (rt->out->open)( rt->out, rt )) ) goto exit ; + + while ( rt->in->hasMore( rt->in ) ) { + if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ; diff --git a/netpbm.spec b/netpbm.spec index 1c5e6b0..b85cc2e 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -23,6 +23,7 @@ Patch14: netpbm-10.34-pamscale.patch Patch15: netpbm-10.35-ppmquantall.patch Patch16: netpbm-10.35-pbmtog3segfault.patch Patch17: netpbm-10.35-pbmtomacp.patch +Patch18: netpbm-10.35-glibc.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex BuildRequires: libX11-devel @@ -80,6 +81,7 @@ netpbm-progs. You'll also need to install the netpbm package. %patch15 -p1 -b .pqall %patch16 -p1 -b .pbmtog3segfault %patch17 -p1 -b .pbmtomacp +%patch18 -p1 -b .glibc ##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile @@ -193,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Aug 23 2007 Jindrich Novy 10.35-16 - rebuild for ppc32 +- fix open() calls so that netpbm builds with new glibc * Mon Aug 20 2007 Jindrich Novy 10.35-15 - fix .ppmquantall patch (#207799)