rpms/netpbm/devel netpbm-10.35-glibc.patch, NONE, 1.1 netpbm.spec, 1.92, 1.93
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Thu Aug 23 07:54:09 UTC 2007
Author: jnovy
Update of /cvs/extras/rpms/netpbm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25046
Modified Files:
netpbm.spec
Added Files:
netpbm-10.35-glibc.patch
Log Message:
fix open() calls so that netpbm builds with new glibc
netpbm-10.35-glibc.patch:
--- NEW FILE netpbm-10.35-glibc.patch ---
--- 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 ;
Index: netpbm.spec
===================================================================
RCS file: /cvs/extras/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- netpbm.spec 23 Aug 2007 07:15:35 -0000 1.92
+++ netpbm.spec 23 Aug 2007 07:53:36 -0000 1.93
@@ -23,6 +23,7 @@
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 @@
%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 @@
%changelog
* Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 10.35-16
- rebuild for ppc32
+- fix open() calls so that netpbm builds with new glibc
* Mon Aug 20 2007 Jindrich Novy <jnovy at redhat.com> 10.35-15
- fix .ppmquantall patch (#207799)
More information about the fedora-extras-commits
mailing list