From e822a047f5c725239c7f8792881b79cc8e6329a7 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 09:16:45 +0000
Subject: auto-import changelog data from netpbm-10.19-6.1.src.rpm

Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
Tue Feb 17 2004 Phil Knirsch <pknirsch@redhat.com> 10.19-6
- Fixed problem in pnmquant with GetOptions() and args/ARGV (#115788).
Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> 10.19-5
- rebuilt
Tue Feb 10 2004 Phil Knirsch <pknirsch@redhat.com> 10.19-4
- Fixed several tmp vulnerabilities in scripts and apps. Based on Debian
    security fix for netpbm-9.24.
Mon Feb 09 2004 Phil Knirsch <pknirsch@redhat.com> 10.19-3
- Included doc tarball with manpages (#114755).
- Fixed small manpage incorrectness (#84922).
- Fixed message from giftopnm (#114756).

---

diff --git a/.cvsignore b/.cvsignore
index 034aea4..e18249c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 netpbm-10.19.tar.bz2
+netpbmdoc-10.19.tar.bz2
diff --git a/netpbm-10.19-message.patch b/netpbm-10.19-message.patch
new file mode 100644
index 0000000..10a5744
--- /dev/null
+++ b/netpbm-10.19-message.patch
@@ -0,0 +1,12 @@
+--- netpbm-10.19/converter/other/giftopnm.c.message	2003-10-30 02:46:12.000000000 +0100
++++ netpbm-10.19/converter/other/giftopnm.c	2004-02-09 17:02:56.964219996 +0100
+@@ -1255,7 +1255,8 @@
+                          requestedImageSeq+1,
+                          imageSeq, imageSeq>1?"s":"" );
+         } else {
+-            pm_message("Reading Image Sequence %d", imageSeq);
++            if (verbose)
++                pm_message("Reading Image Sequence %d", imageSeq+1);
+             convertImage(ifP, !allImages && (imageSeq != requestedImageSeq), 
+                          imageout_file, alphafile, gifScreen, gif89);
+         }
diff --git a/netpbm.spec b/netpbm.spec
index f2d71a5..8fe8280 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,14 +1,18 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.19
-Release: 2
+Release: 6.1
 License: freeware
 Group: System Environment/Libraries
 Source0: netpbm-10.19.tar.bz2
+Source1: netpbmdoc-10.19.tar.bz2
 Patch1: netpbm-10.17-time.patch
 Patch2: netpbm-9.24-strip.patch
 Patch3: netpbm-10.19-security.patch
 Patch4: netpbm-10.18-manpath.patch
+Patch5: netpbm-10.19-message.patch
+Patch6: netpbm-10.19-security2.patch
+Patch7: netpbm-10.19-getopt.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
 Obsoletes: libgr
@@ -56,6 +60,9 @@ netpbm-progs.  You'll also need to install the netpbm package.
 %patch2 -p1 -b .strip
 %patch3 -p1 -b .security
 %patch4 -p1 -b .manpath
+%patch5 -p1 -b .message
+%patch6 -p1 -b .security2
+%patch7 -p1 -b .getopt
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -106,13 +113,15 @@ fi
 cp -af lib/libnetpbm.a $RPM_BUILD_ROOT%{_libdir}/libnetpbm.a
 ln -sf libnetpbm.so.10 $RPM_BUILD_ROOT%{_libdir}/libnetpbm.so
 
+mkdir -p $RPM_BUILD_ROOT%{_mandir}
+tar jxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_mandir}
+
 mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_libdir}
 rm -rf $RPM_BUILD_ROOT/usr/README
 rm -rf $RPM_BUILD_ROOT/usr/VERSION
 rm -rf $RPM_BUILD_ROOT/usr/link
 rm -rf $RPM_BUILD_ROOT/usr/misc
 rm -rf $RPM_BUILD_ROOT/usr/man
-rm -rf $RPM_BUILD_ROOT/usr/man
 rm -rf $RPM_BUILD_ROOT/usr/pkginfo
 
 %clean
@@ -142,6 +151,24 @@ rm -rf $RPM_BUILD_ROOT/usr/pkginfo
 %{_mandir}/man5/*
 
 %changelog
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Feb 17 2004 Phil Knirsch <pknirsch@redhat.com> 10.19-6
+- Fixed problem in pnmquant with GetOptions() and args/ARGV (#115788).
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> 10.19-5
+- rebuilt
+
+* Tue Feb 10 2004 Phil Knirsch <pknirsch@redhat.com> 10.19-4
+- Fixed several tmp vulnerabilities in scripts and apps. Based on Debian
+  security fix for netpbm-9.24.
+
+* Mon Feb 09 2004 Phil Knirsch <pknirsch@redhat.com> 10.19-3
+- Included doc tarball with manpages (#114755).
+- Fixed small manpage incorrectness (#84922).
+- Fixed message from giftopnm (#114756).
+
 * Fri Jan 30 2004 Phil Knirsch <pknirsch@redhat.com> 10.19-2
 - No need anymore to fix ppmfade and ppmshade.
 
diff --git a/sources b/sources
index 9e852de..77bc2c1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 61df6fc4e351de45d773e9cb875361f8  netpbm-10.19.tar.bz2
+b1bf1fb30d265167ebd77e6c03b2f93d  netpbmdoc-10.19.tar.bz2