Mon May 18 05:15:14 UTC 2009

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2438

Modified Files:
	.cvsignore netpbm-10.35-glibc.patch netpbm.spec sources 
Removed Files:
	netpbm-10.22-cmapsize.patch netpbm-10.35-docfix.patch 
	netpbm-10.35-pamtosvgsegfault.patch 
	netpbm-10.35-pbmtomacp.patch netpbm-10.35-ppmdfontfix.patch 
	netpbm-10.35-ppmfadeusage.patch netpbm-10.35-ppmquantall.patch 
	netpbm-10.35-ppmrainbowexit.patch 
	netpbm-10.35-ximtoppmsegfault.patch 
Log Message:
* Mon May 18 2009 Jindrich Novy <jnovy at redhat.com> 10.35.64-1
- update to 10.35.64
- fixes pnmremap, giftopnm, ppmpat, ppmdraw
- handful of our patches applied upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-11/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54

--- .cvsignore	14 Apr 2009 10:05:34 -0000	1.53
+++ .cvsignore	18 May 2009 05:14:43 -0000	1.54
@@ -1 +1 @@
-netpbm-10.35.62.tar.bz2
+netpbm-10.35.64.tar.bz2

netpbm-10.35-glibc.patch:

Index: netpbm-10.35-glibc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-11/netpbm-10.35-glibc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netpbm-10.35-glibc.patch	14 Apr 2009 10:33:48 -0000	1.2
+++ netpbm-10.35-glibc.patch	18 May 2009 05:14:44 -0000	1.3
@@ -11,41 +11,3 @@
  
    while ( rt->in->hasMore( rt->in ) ) {
      if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ;
-diff -up netpbm-10.35.62/converter/ppm/xvminitoppm.c.glibc netpbm-10.35.62/converter/ppm/xvminitoppm.c
---- netpbm-10.35.62/converter/ppm/xvminitoppm.c.glibc	2009-04-13 09:14:06.000000000 +0200
-+++ netpbm-10.35.62/converter/ppm/xvminitoppm.c	2009-04-14 12:27:48.000000000 +0200
-@@ -52,7 +52,7 @@ parseCommandLine(int const argc,
- 
- 
- static void
--getline(FILE * const ifP,
-+get_line(FILE * const ifP,
-         char * const buf,
-         size_t const size) {
- 
-@@ -105,7 +105,7 @@ readXvHeader(FILE *         const ifP,
-     int rc;
-     bool endOfComments;
-     
--    getline(ifP, buf, sizeof(buf));
-+    get_line(ifP, buf, sizeof(buf));
- 
-     if (!STRNEQ(buf, "P7 332", 6))
-         pm_error("Input is not a XV thumbnail picture.  It does not "
-@@ -113,14 +113,14 @@ readXvHeader(FILE *         const ifP,
- 
-     endOfComments = FALSE;
-     while (!endOfComments) {
--        getline(ifP, buf, sizeof(buf));
-+        get_line(ifP, buf, sizeof(buf));
-         if (STRNEQ(buf, "#END_OF_COMMENTS", 16))
-             endOfComments = TRUE;
-         else if (STRNEQ(buf, "#BUILTIN", 8))
-             pm_error("This program does not know how to "
-                      "convert builtin XV thumbnail pictures");
-     }
--    getline(ifP, buf, sizeof(buf));
-+    get_line(ifP, buf, sizeof(buf));
-     rc = sscanf(buf, "%u %u %u", &cols, &rows, &maxval);
-     if (rc != 3)
-         pm_error("error parsing dimension info '%s'.  "


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-11/netpbm.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- netpbm.spec	14 Apr 2009 10:33:48 -0000	1.138
+++ netpbm.spec	18 May 2009 05:14:44 -0000	1.139
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.62
+Version: 10.35.64
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -24,21 +24,13 @@ 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
-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-pamtosvgsegfault.patch
 Patch22: netpbm-10.35-pnmmontagefix.patch
 Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
 Patch24: netpbm-10.35-64bitfix.patch
-Patch25: netpbm-10.35-ximtoppmsegfault.patch
-Patch26: netpbm-10.35-ppmfadeusage.patch
-Patch27: netpbm-10.35-ppmrainbowexit.patch
-Patch28: netpbm-10.35-ppmdfontfix.patch
 Patch29: netpbm-10.35-svgtopam.patch
-Patch30: netpbm-10.35-docfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -93,21 +85,13 @@ netpbm-progs.  You'll also need to insta
 %patch12 -p1 -b .ppmtompeg
 %patch13 -p1 -b .multilib
 %patch14 -p1 -b .pamscale
-%patch15 -p1 -b .pqall
-%patch17 -p1 -b .pbmtomacp
 %patch18 -p1 -b .glibc
 %patch19 -p1 -b .gcc43
 %patch20 -p1 -b .rgbtxt
-%patch21 -p1 -b .pamtosvgsegfault
 %patch22 -p1 -b .pnmmontagefix
 %patch23 -p1 -b .pnmtofiasco-stdin
 %patch24 -p1 -b .64bitfix
-%patch25 -p1 -b .ximtoppmsegfault
-%patch26 -p1 -b .ppmfadeusage
-%patch27 -p1 -b .ppmrainbowexit
-%patch28 -p1 -b .ppmdfontfix
 %patch29 -p1 -b .svgtopam
-%patch30 -p1 -b .docfix
 
 %build
 ./configure <<EOF
@@ -233,6 +217,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Mon May 18 2009 Jindrich Novy <jnovy at redhat.com> 10.35.64-1
+- update to 10.35.64
+- fixes pnmremap, giftopnm, ppmpat, ppmdraw
+- handful of our patches applied upstream
+
 * Tue Apr 14 2009 Jindrich Novy <jnovy at redhat.com> 10.35.62-1
 - update to 10.35.62
 - upstream fixes pamstereogram


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-11/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	14 Apr 2009 10:05:35 -0000	1.57
+++ sources	18 May 2009 05:14:44 -0000	1.58
@@ -1 +1 @@
-70617ccd4e4e2c4fdd7092ba6e004334  netpbm-10.35.62.tar.bz2
+1f6e7c278db25afd8a7ca2d5149c4fce  netpbm-10.35.64.tar.bz2


--- netpbm-10.22-cmapsize.patch DELETED ---


--- netpbm-10.35-docfix.patch DELETED ---


--- netpbm-10.35-pamtosvgsegfault.patch DELETED ---


--- netpbm-10.35-pbmtomacp.patch DELETED ---


--- netpbm-10.35-ppmdfontfix.patch DELETED ---


--- netpbm-10.35-ppmfadeusage.patch DELETED ---


--- netpbm-10.35-ppmquantall.patch DELETED ---


--- netpbm-10.35-ppmrainbowexit.patch DELETED ---


--- netpbm-10.35-ximtoppmsegfault.patch DELETED ---


