diff --git a/.cvsignore b/.cvsignore index 970e4af..034aea4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netpbm-9.24-nojbig.tar.bz2 +netpbm-10.19.tar.bz2 diff --git a/netpbm-10.17-time.patch b/netpbm-10.17-time.patch new file mode 100644 index 0000000..8caf944 --- /dev/null +++ b/netpbm-10.17-time.patch @@ -0,0 +1,20 @@ +--- netpbm-10.17/converter/other/fiasco/config.h.time 2001-05-28 02:43:11.000000000 +0200 ++++ netpbm-10.17/converter/other/fiasco/config.h 2003-09-08 15:23:17.000000000 +0200 +@@ -19,7 +19,7 @@ + #define STDC_HEADERS 1 + + /* Define if you can safely include both and . */ +-#define TIME_WITH_SYS_TIME 1 ++/* #undef TIME_WITH_SYS_TIME 1 */ + + /* Define if your processor stores words with the most significant + byte first (like Motorola and SPARC, unlike Intel and VAX). */ +@@ -79,7 +79,7 @@ + #define HAVE_STRING_H 1 + + /* Define if you have the header file. */ +-#define HAVE_SYS_TIME_H 1 ++/* #undef HAVE_SYS_TIME_H 1 */ + + /* Define if you have the header file. */ + #define HAVE_UNISTD_H 1 diff --git a/netpbm.spec b/netpbm.spec index b03e034..f2d71a5 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,16 +1,14 @@ Summary: A library for handling different graphics file formats. Name: netpbm -Version: 9.24 -Release: 12.1.1 +Version: 10.19 +Release: 2 License: freeware Group: System Environment/Libraries -Source0: netpbm-9.24-nojbig.tar.bz2 -Patch0: netpbm-9.8-install.patch -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 +Source0: netpbm-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 Buildroot: %{_tmppath}/%{name}-root BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl Obsoletes: libgr @@ -54,15 +52,13 @@ netpbm-progs. You'll also need to install the netpbm package. %prep %setup -q -%patch0 -p1 -b .install %patch1 -p1 -b .time -%patch2 -p1 -b .struct -%patch3 -p1 -b .strip -%patch4 -p1 -b .security -%patch5 -p1 -b .debiansecurity +%patch2 -p1 -b .strip +%patch3 -p1 -b .security +%patch4 -p1 -b .manpath -mv shhopt/shhopt.h shhopt/pbmshhopt.h -perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile +##mv shhopt/shhopt.h shhopt/pbmshhopt.h +##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile %build ./configure < 9.24-12.1.1 -- Included new debian security fixes and made security errata. +* Fri Jan 30 2004 Phil Knirsch 10.19-2 +- No need anymore to fix ppmfade and ppmshade. + +* Thu Jan 29 2004 Phil Knirsch 10.19-1 +- Major update to latest upstream version 10.19. * Wed Jun 04 2003 Elliot Lee - rebuilt diff --git a/sources b/sources index 6bcf823..9e852de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f52a9c818ff71b4494e15563651f3be netpbm-9.24-nojbig.tar.bz2 +61df6fc4e351de45d773e9cb875361f8 netpbm-10.19.tar.bz2