rpms/netpbm/devel netpbm-10.31-msbmp.patch, NONE, 1.1 netpbm.spec, 1.54, 1.55

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1895

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-10.31-msbmp.patch 
Log Message:
* Mon Feb 20 2006 Jindrich Novy <jnovy at redhat.com> 10.31-5
- add missing flex BuildRequires
- fix anytopnm to recognize ms-bmp files (#182060)


netpbm-10.31-msbmp.patch:
 anytopnm |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE netpbm-10.31-msbmp.patch ---
--- netpbm-10.31/converter/other/anytopnm.msbmp	2006-02-14 15:21:56.000000000 +0100
+++ netpbm-10.31/converter/other/anytopnm	2006-02-20 10:19:13.000000000 +0100
@@ -82,6 +82,9 @@ computeTypeFromMimeType () {
         image/bmp )
             filetype="bmp"
             ;;
+        image/x-ms-bmp )
+            filetype="bmp"
+            ;;
         image/png )
             filetype="png"
             ;;


Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- netpbm.spec	14 Feb 2006 14:25:38 -0000	1.54
+++ netpbm.spec	20 Feb 2006 11:05:18 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.31
-Release: 4
+Release: 5
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -21,8 +21,9 @@
 Patch11: netpbm-10.29-pnmtopng.patch
 Patch12: netpbm-10.30-rgbtxt.patch
 Patch13: netpbm-10.31-xwdfix.patch
+Patch14: netpbm-10.31-msbmp.patch
 Buildroot: %{_tmppath}/%{name}-root
-BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
+BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex
 Obsoletes: libgr
 
 %description
@@ -78,6 +79,7 @@
 %patch11 -p1 -b .pnmtopng
 %patch12 -p1 -b .rgbtxt
 %patch13 -p1 -b .xwdfix
+%patch14 -p1 -b .msbmp
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -176,6 +178,10 @@
 %{_mandir}/man5/*
 
 %changelog
+* Mon Feb 20 2006 Jindrich Novy <jnovy at redhat.com> 10.31-5
+- add missing flex BuildRequires
+- fix anytopnm to recognize ms-bmp files (#182060)
+
 * Tue Feb 14 2006 Jindrich Novy <jnovy at redhat.com> 10.31-4
 - make xwdtopnm work on x86_64 (#181001)