diff --git a/.gitignore b/.gitignore index d5750f2..46a1472 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/netpbm-10.60.05.tar.xz +/netpbm-10.61.01.tar.xz diff --git a/netpbm-cmuwtopbm.patch b/netpbm-cmuwtopbm.patch index 1bddba8..f5b328b 100644 --- a/netpbm-cmuwtopbm.patch +++ b/netpbm-cmuwtopbm.patch @@ -1,6 +1,6 @@ -diff -up netpbm-10.47.12/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix netpbm-10.47.12/converter/pbm/cmuwmtopbm.c ---- netpbm-10.47.12/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix 2010-04-27 15:47:14.000000000 +0200 -+++ netpbm-10.47.12/converter/pbm/cmuwmtopbm.c 2010-05-03 15:17:06.081277896 +0200 +diff -up netpbm-10.61.01/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix netpbm-10.61.01/converter/pbm/cmuwmtopbm.c +--- netpbm-10.61.01/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix 2013-01-02 18:39:57.000000000 +0100 ++++ netpbm-10.61.01/converter/pbm/cmuwmtopbm.c 2013-01-03 05:41:36.024984241 +0100 @@ -18,7 +18,7 @@ This program does not check the pad bits at the end of each row. */ @@ -8,11 +8,11 @@ diff -up netpbm-10.47.12/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix netpbm-10.47.12 - +#include #include "pbm.h" - #include "cmuwm.h" -@@ -33,7 +33,7 @@ readCmuwmHeader(FILE * const ifP - const char * const initReadError = + /*-------------------------- +@@ -42,7 +42,7 @@ readCmuwmHeader(FILE * const ifP "CMU window manager header EOF / read error"; + uint32_t const cmuwmMagic = 0xf10040bb; - long l; + uint32_t l; diff --git a/netpbm-manfix.patch b/netpbm-manfix.patch index cd50a3c..530e5e7 100644 --- a/netpbm-manfix.patch +++ b/netpbm-manfix.patch @@ -109,17 +109,18 @@ diff -up netpbm-10.59.03/userguide/pamstereogram.html.manfix netpbm-10.59.03/use + + - + Pamstereogram User Manual -@@ -11,7 +11,7 @@ +@@ -11,8 +11,7 @@ -

Updated: 20 June 2012

+

Updated:30 December 2012

-

Table Of Contents

+- +

Table Of Contents

-

NAME

+ diff -up netpbm-10.59.03/userguide/pamtoavs.html.manfix netpbm-10.59.03/userguide/pamtoavs.html --- netpbm-10.59.03/userguide/pamtoavs.html.manfix 2012-09-22 03:46:15.000000000 +0200 +++ netpbm-10.59.03/userguide/pamtoavs.html 2012-09-25 10:47:22.759174777 +0200 diff --git a/netpbm-security-code.patch b/netpbm-security-code.patch index f9d1ede..27b49fb 100644 --- a/netpbm-security-code.patch +++ b/netpbm-security-code.patch @@ -1668,7 +1668,7 @@ diff -up netpbm-10.58.01/urt/scanargs.c.security-code netpbm-10.58.01/urt/scanar + * 2002-12-19: Fix maths wrapping bugs. Alan Cox */ - #include "rle.h" + #include @@ -63,8 +65,8 @@ typedef int *ptr; /* * Storage allocation macros diff --git a/netpbm.spec b/netpbm.spec index ea751f3..0b88668 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,6 +1,6 @@ Summary: A library for handling different graphics file formats Name: netpbm -Version: 10.60.05 +Version: 10.61.01 Release: 1%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain @@ -256,6 +256,10 @@ rm -rf $RPM_BUILD_ROOT %doc userguide/* %changelog +* Thu Jan 03 2013 Jindrich Novy 10.61.01-1 +- update to 10.61.01 +- sync patches + * Fri Dec 14 2012 Jindrich Novy 10.60.05-1 - update to 10.60.05 - fixes pngtopam and ppmpat diff --git a/sources b/sources index b2cf2b9..18fb12a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9da2866e8591f21ecb35041656bd5c6b netpbm-10.60.05.tar.xz +aeb9375f0c8a17451804ca0f47149107 netpbm-10.61.01.tar.xz