rpms/netpbm/devel netpbm-10.27-bmptopnm.patch, 1.4, 1.5 netpbm-10.35-ppmquantall.patch, 1.1, 1.2 netpbm.spec, 1.90, 1.91

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/netpbm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29531

Modified Files:
	netpbm-10.27-bmptopnm.patch netpbm-10.35-ppmquantall.patch 
	netpbm.spec 
Log Message:
- fix .ppmquantall patch (#207799)
- merge cmapsize with bmptopnm patch (#224554)


netpbm-10.27-bmptopnm.patch:

Index: netpbm-10.27-bmptopnm.patch
===================================================================
RCS file: /cvs/extras/rpms/netpbm/devel/netpbm-10.27-bmptopnm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netpbm-10.27-bmptopnm.patch	29 Jan 2007 12:50:54 -0000	1.4
+++ netpbm-10.27-bmptopnm.patch	20 Aug 2007 12:04:27 -0000	1.5
@@ -9,11 +9,3 @@
      unsigned int pos;
          /* Current byte position in the BMP file */
  
-@@ -1278,7 +1278,6 @@ readBmp(FILE *               const ifP, 
-         BMPreadfileheader(ifP, &bytesRead, &offBits);
-         pos += bytesRead;
-     }
--    if(BMPheader.cmapsize != 0)
-     {
-         unsigned int bytesRead;
-         BMPreadinfoheader(ifP, &bytesRead, &BMPheader);

netpbm-10.35-ppmquantall.patch:

Index: netpbm-10.35-ppmquantall.patch
===================================================================
RCS file: /cvs/extras/rpms/netpbm/devel/netpbm-10.35-ppmquantall.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netpbm-10.35-ppmquantall.patch	24 Sep 2006 05:04:34 -0000	1.1
+++ netpbm-10.35-ppmquantall.patch	20 Aug 2007 12:04:27 -0000	1.2
@@ -7,8 +7,8 @@
  
 -set widths=()
 -set heights=()
-+set widths
-+set heights
++widths=()
++heights=()
  
  for i in ${files[@]}; do
      widths=(${widths[*]} `grep -v '^#' $i | sed '1d; s/ .*//; 2q'`)


Index: netpbm.spec
===================================================================
RCS file: /cvs/extras/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- netpbm.spec	16 Jul 2007 11:03:44 -0000	1.90
+++ netpbm.spec	20 Aug 2007 12:04:27 -0000	1.91
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
 Version: 10.35
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: Assorted licenses, see %{_docdir}/%{name}-%{version}/copyright_summary
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -11,7 +11,6 @@
 Patch2: netpbm-9.24-strip.patch
 Patch3: netpbm-10.19-message.patch
 Patch4: netpbm-10.22-security2.patch
-Patch5: netpbm-10.22-cmapsize.patch
 Patch6: netpbm-10.23-security.patch
 Patch7: netpbm-10.24-nodoc.patch
 Patch8: netpbm-10.28-gcc4.patch
@@ -69,7 +68,6 @@
 %patch2 -p1 -b .strip
 %patch3 -p1 -b .message
 %patch4 -p1 -b .security2
-%patch5 -p1 -b .cmapsize
 %patch6 -p1 -b .security
 %patch7 -p1 -b .nodoc
 %patch8 -p1 -b .gcc4
@@ -193,6 +191,10 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Mon Aug 20 2007 Jindrich Novy <jnovy at redhat.com> 10.35-15
+- fix .ppmquantall patch (#207799)
+- merge cmapsize with bmptopnm patch (#224554)
+
 * Mon Jul 16 2007 Jindrich Novy <jnovy at redhat.com> 10.35-14
 - /usr/share/netpbm is no more unowned (#248300)