From dce3fc10441f090f8812f70a2fee61f1adca2e94 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 09:15:23 +0000
Subject: [PATCH] auto-import netpbm-9.24-12.1.1 from
 netpbm-9.24-12.1.1.src.rpm

---
 netpbm.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/netpbm.spec b/netpbm.spec
index 49e5ac0..b03e034 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 9.24
-Release: 12
+Release: 12.1.1
 License: freeware
 Group: System Environment/Libraries
 Source0: netpbm-9.24-nojbig.tar.bz2
@@ -10,6 +10,7 @@ Patch1: netpbm-9.9-time.patch
 Patch2: netpbm-9.24-struct.patch
 Patch3: netpbm-9.24-strip.patch
 Patch4: netpbm-9.24-security.patch
+Patch5: netpbm-9.24-debiansecurity.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
 Obsoletes: libgr
@@ -58,6 +59,7 @@ netpbm-progs.  You'll also need to install the netpbm package.
 %patch2 -p1 -b .struct
 %patch3 -p1 -b .strip
 %patch4 -p1 -b .security
+%patch5 -p1 -b .debiansecurity
 
 mv shhopt/shhopt.h shhopt/pbmshhopt.h
 perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -168,6 +170,9 @@ $RPM_BUILD_ROOT%{_bindir}/{ppmfade,ppmshadow}
 %{_mandir}/man5/*
 
 %changelog
+* Thu Jan 22 2004 Phil Knirsch <pknirsch@redhat.com> 9.24-12.1.1
+- Included new debian security fixes and made security errata.
+
 * Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
 - rebuilt