[netpbm/f18] update to 10.61.01

Mon Jan 28 15:22:47 UTC 2013

commit a06976f2f14c177a5f5166f05c61d930f0ec6c7e
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Mon Jan 28 16:22:35 2013 +0100

    update to 10.61.01

 .gitignore                 |    2 +-
 netpbm-cmuwtopbm.patch     |   12 +++++-----
 netpbm-manfix.patch        |    9 ++++---
 netpbm-pamscale.patch      |   11 ----------
 netpbm-security-code.patch |    2 +-
 netpbm.spec                |   45 +++++++++++++++++++++++++++++++++----------
 sources                    |    2 +-
 7 files changed, 48 insertions(+), 35 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 4eb26d4..46a1472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/netpbm-10.60.03.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 <stdint.h>
  #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
 +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
 +<html>
  <head>
- <meta http-equiv="Content-type" content="text/html">
+ <meta charset="UTF-8">
  <title>Pamstereogram User Manual</title>
-@@ -11,7 +11,7 @@
+@@ -11,8 +11,7 @@
  
- <p>Updated: 20 June 2012</p>
+ <p>Updated:30 December 2012</p>
  
 -<p><a href="#contents">Table Of Contents</a></p>
+-
 +<p><a href="#index">Table Of Contents</a></p>
  
- 
  <h2 id="name">NAME</h2>
+ 
 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 <alan at redhat.com>
   */
  
- #include "rle.h"
+ #include <stdio.h>
 @@ -63,8 +65,8 @@ typedef int *ptr;
  /* 
   * Storage allocation macros
diff --git a/netpbm.spec b/netpbm.spec
index 5880712..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.03
+Version: 10.61.01
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -9,6 +9,7 @@ URL: http://netpbm.sourceforge.net/
 # Source0 is prepared by
 # svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced netpbm-%{version}
 # svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{version}/userguide
+# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/trunk/test netpbm-%{version}/test
 # and removing the .svn directories ( find -name "\.svn" -type d -print0 | xargs -0 rm -rf )
 # and removing the ppmtompeg code, due to patents ( rm -rf netpbm-%{version}/converter/ppm/ppmtompeg/ )
 Source0: netpbm-%{version}.tar.xz
@@ -22,7 +23,6 @@ Patch7: netpbm-bmptopnm.patch
 Patch8: netpbm-CAN-2005-2471.patch
 Patch9: netpbm-xwdfix.patch
 Patch11: netpbm-multilib.patch
-Patch12: netpbm-pamscale.patch
 Patch13: netpbm-glibc.patch
 Patch15: netpbm-docfix.patch
 Patch16: netpbm-ppmfadeusage.patch
@@ -218,6 +218,12 @@ echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > pgmtopbm
 chmod 0755 pgmtopbm
 popd
 
+%check
+pushd test
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
+export PBM_TESTPREFIX=$RPM_BUILD_ROOT%{_bindir}
+./Execute-Tests && exit 0
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -250,6 +256,23 @@ rm -rf $RPM_BUILD_ROOT
 %doc userguide/*
 
 %changelog
+* Thu Jan 03 2013 Jindrich Novy <jnovy at redhat.com> 10.61.01-1
+- update to 10.61.01
+- sync patches
+
+* Fri Dec 14 2012 Jindrich Novy <jnovy at redhat.com> 10.60.05-1
+- update to 10.60.05
+- fixes pngtopam and ppmpat
+
+* Wed Dec 05 2012 Jindrich Novy <jnovy at redhat.com> 10.60.04-1
+- update to 10.60.04
+- fixes pamtotiff, pnmmontage, pnmpsnr, pbmpscale, pgmhist,
+  pampick, pamtompfont
+- fix dates in changelog
+
+* Tue Nov 27 2012 Jindrich Novy <jnovy at redhat.com> 10.60.03-2
+- add upstream test suite
+
 * Wed Nov 21 2012 Jindrich Novy <jnovy at redhat.com> 10.60.03-1
 - update to 10.60.3
 - fixes xbmptopbm, pamtojpeg2k
@@ -361,7 +384,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Oct 19 2010 Jindrich Novy <jnovy at redhat.com> 10.47.21-2
 - fix HTML pages from which man pages are now generated correctly (#644248)
 
-* Fri Oct 18 2010 Jindrich Novy <jnovy at redhat.com> 10.47.21-1
+* Mon Oct 18 2010 Jindrich Novy <jnovy at redhat.com> 10.47.21-1
 - update to 10.47.21
 
 * Fri Oct  1 2010 Jindrich Novy <jnovy at redhat.com> 10.47.20-1
@@ -442,7 +465,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Dec 30 2009 Jindrich Novy <jnovy at redhat.com> 10.47.07-1
 - update to 10.47.07
 
-* Fri Dec 14 2009 Jindrich Novy <jnovy at redhat.com> 10.47.06-1
+* Mon Dec 14 2009 Jindrich Novy <jnovy at redhat.com> 10.47.06-1
 - update to 10.47.06 - fixes the dumb pamtosvg mistake in 10.47.05
 - pnmmargin won't create leftovers in /tmp (#547888)
 
@@ -478,7 +501,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Jun 27 2009 Jindrich Novy <jnovy at redhat.com> 10.35.65-1
 - update to 10.35.65
 
-* Mon May 17 2009 Jindrich Novy <jnovy at redhat.com> 10.35.64-1
+* Sun May 17 2009 Jindrich Novy <jnovy at redhat.com> 10.35.64-1
 - update to 10.35.64
 - fixes pnmremap, giftopnm, ppmpat, ppmdraw
 
@@ -574,7 +597,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Aug 27 2008 Jindrich Novy <jnovy at redhat.com> 10.35.49-2
 - link against system jasper instead of embedded one (#460300)
 
-* Mon Aug 14 2008 Jindrich Novy <jnovy at rehdat.com> 10.35.49-1
+* Thu Aug 14 2008 Jindrich Novy <jnovy at rehdat.com> 10.35.49-1
 - update to 10.35.49
 - fixes crash in pamcut when cutting a region entirely to the
   left or right of the input image, with -pad
@@ -633,14 +656,14 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Dec 13 2007 Jindrich Novy <jnovy at redhat.com> 10.35.35-1
 - update to 10.35.35
 
-* Wed Nov 26 2007 Jindrich Novy <jnovy at redhat.com> 10.35.34-1
+* Mon Nov 26 2007 Jindrich Novy <jnovy at redhat.com> 10.35.34-1
 - update to 10.35.34
 - sync security patch and fix typos
 
 * Wed Nov 14 2007 Jindrich Novy <jnovy at redhat.com> 10.35.33-1
 - update to 10.35.33
 
-* Wed Nov  2 2007 Jindrich Novy <jnovy at redhat.com> 10.35.32-2
+* Fri Nov  2 2007 Jindrich Novy <jnovy at redhat.com> 10.35.32-2
 - remove man pages that lacks corresponding binaries (#220739)
 
 * Thu Oct 18 2007 Jindrich Novy <jnovy at redhat.com> 10.35.32-1
@@ -755,7 +778,7 @@ rm -rf $RPM_BUILD_ROOT
 - fix multilib conflict (#192735)
 - remove jbigtopnm man page
 
-* Thu Apr 14 2006 Jindrich Novy <jnovy at redhat.com> 10.33-2
+* Fri Apr 14 2006 Jindrich Novy <jnovy at redhat.com> 10.33-2
 - fix image corruption in ppmtogif, thanks to Gilles Detillieux (#188597)
 - fix nsting.h to let pnmtopng and other utilities using seekable opening
   mode work on x86_64 (#188594)
@@ -874,7 +897,7 @@ rm -rf $RPM_BUILD_ROOT
 - fix overflow checking of integers with incompatible endianess
   causing problems using xwdtopnm (#147790)
 
-* Mon Mar 09 2005 Jindrich Novy <jnovy at redhat.com> 10.26.4-2
+* Wed Mar 09 2005 Jindrich Novy <jnovy at redhat.com> 10.26.4-2
 - add .gcc4 patch to fix some missing declarations of headers,
   some pointer signedness mismatches, remove xmalloc2
 - rebuilt with gcc4
@@ -1091,7 +1114,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Jul 29 1999 Bill Nottingham <notting at redhat.com>
 - add a pile of foo-to-bar.fpi filters (#4251)
 
-* Mon Mar 23 1999 Michael Johnson <johnsonm at redhat.com>
+* Tue Mar 23 1999 Michael Johnson <johnsonm at redhat.com>
 - removed old png.h header file that was causing png utils to die
 - build png in build instead of install section...
 
diff --git a/sources b/sources
index 1c79acf..18fb12a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0f25f22b1dddc7c0b258add70e81814  netpbm-10.60.03.tar.xz
+aeb9375f0c8a17451804ca0f47149107  netpbm-10.61.01.tar.xz
