From 2b7214814e88bb01b2c6fceecf2d06a66d9ece1e Mon Sep 17 00:00:00 2001 From: Jindrich Novy <jnovy@redhat.com> Date: Fri, 22 Jun 2012 09:58:39 +0200 Subject: [PATCH] update to 10.58.03 - pnmtops is back --- .gitignore | 2 +- netpbm-manfix.patch | 86 ++++++++++++++++++++++----------------------- netpbm.spec | 8 +++-- sources | 2 +- 4 files changed, 51 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 8eea40c..da798ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/netpbm-10.58.01.tar.xz +/netpbm-10.58.03.tar.xz diff --git a/netpbm-manfix.patch b/netpbm-manfix.patch index 4947e49..2c54e72 100644 --- a/netpbm-manfix.patch +++ b/netpbm-manfix.patch @@ -1,6 +1,6 @@ -diff -up netpbm-10.58.01/userguide/avstopam.html.manfix netpbm-10.58.01/userguide/avstopam.html ---- netpbm-10.58.01/userguide/avstopam.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/avstopam.html 2012-04-09 15:42:52.968497437 +0200 +diff -up netpbm-10.58.03/userguide/avstopam.html.manfix netpbm-10.58.03/userguide/avstopam.html +--- netpbm-10.58.03/userguide/avstopam.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/avstopam.html 2012-06-22 09:53:12.964340240 +0200 @@ -1,8 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> @@ -12,9 +12,9 @@ diff -up netpbm-10.58.01/userguide/avstopam.html.manfix netpbm-10.58.01/userguid </head> <body> -diff -up netpbm-10.58.01/userguide/escp2topbm.html.manfix netpbm-10.58.01/userguide/escp2topbm.html ---- netpbm-10.58.01/userguide/escp2topbm.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/escp2topbm.html 2012-04-09 15:42:52.968497437 +0200 +diff -up netpbm-10.58.03/userguide/escp2topbm.html.manfix netpbm-10.58.03/userguide/escp2topbm.html +--- netpbm-10.58.03/userguide/escp2topbm.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/escp2topbm.html 2012-06-22 09:53:12.965340228 +0200 @@ -2,10 +2,11 @@ <HTML><HEAD><TITLE>Escp2topbm User Manual</TITLE></HEAD> <BODY> @@ -28,9 +28,9 @@ diff -up netpbm-10.58.01/userguide/escp2topbm.html.manfix netpbm-10.58.01/usergu escp2topbm - convert an ESC/P2 printer file to a PBM image <H2 id="synopsis">SYNOPSIS</H2> -diff -up netpbm-10.58.01/userguide/faxformat.html.manfix netpbm-10.58.01/userguide/faxformat.html ---- netpbm-10.58.01/userguide/faxformat.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/faxformat.html 2012-04-09 15:42:52.969497425 +0200 +diff -up netpbm-10.58.03/userguide/faxformat.html.manfix netpbm-10.58.03/userguide/faxformat.html +--- netpbm-10.58.03/userguide/faxformat.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/faxformat.html 2012-06-22 09:53:12.972340140 +0200 @@ -5,10 +5,12 @@ Updated: 03 December 2008 <BR> @@ -44,9 +44,9 @@ diff -up netpbm-10.58.01/userguide/faxformat.html.manfix netpbm-10.58.01/usergui <p>The ITU (formerly CCITT) publishes standards for operation of fax machines (the idea is to provide a way to be sure that a fax machine is able to receive a fax sent by another). These standards incidentally specify graphics file -diff -up netpbm-10.58.01/userguide/pampaintspill.html.manfix netpbm-10.58.01/userguide/pampaintspill.html ---- netpbm-10.58.01/userguide/pampaintspill.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/pampaintspill.html 2012-04-09 15:42:52.969497425 +0200 +diff -up netpbm-10.58.03/userguide/pampaintspill.html.manfix netpbm-10.58.03/userguide/pampaintspill.html +--- netpbm-10.58.03/userguide/pampaintspill.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/pampaintspill.html 2012-06-22 09:53:12.972340140 +0200 @@ -1,8 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<html xmlns="http://www.w3.org/1999/xhtml"> @@ -65,9 +65,9 @@ diff -up netpbm-10.58.01/userguide/pampaintspill.html.manfix netpbm-10.58.01/use <p>pampaintspill - smoothly spill colors into the background</p> <h2><a name="synopsis">SYNOPSIS</a></h2> -diff -up netpbm-10.58.01/userguide/pamrecolor.html.manfix netpbm-10.58.01/userguide/pamrecolor.html ---- netpbm-10.58.01/userguide/pamrecolor.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/pamrecolor.html 2012-04-09 15:42:52.969497425 +0200 +diff -up netpbm-10.58.03/userguide/pamrecolor.html.manfix netpbm-10.58.03/userguide/pamrecolor.html +--- netpbm-10.58.03/userguide/pamrecolor.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/pamrecolor.html 2012-06-22 09:53:12.973340128 +0200 @@ -1,8 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> @@ -87,9 +87,9 @@ diff -up netpbm-10.58.01/userguide/pamrecolor.html.manfix netpbm-10.58.01/usergu <h2 id="name">NAME</h2> -diff -up netpbm-10.58.01/userguide/pamsistoaglyph.html.manfix netpbm-10.58.01/userguide/pamsistoaglyph.html ---- netpbm-10.58.01/userguide/pamsistoaglyph.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/pamsistoaglyph.html 2012-04-09 15:42:52.971497399 +0200 +diff -up netpbm-10.58.03/userguide/pamsistoaglyph.html.manfix netpbm-10.58.03/userguide/pamsistoaglyph.html +--- netpbm-10.58.03/userguide/pamsistoaglyph.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/pamsistoaglyph.html 2012-06-22 09:53:12.973340128 +0200 @@ -1,8 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<html xmlns="http://www.w3.org/1999/xhtml"> @@ -100,29 +100,29 @@ diff -up netpbm-10.58.01/userguide/pamsistoaglyph.html.manfix netpbm-10.58.01/us </head> <body> -diff -up netpbm-10.58.01/userguide/pamstereogram.html.manfix netpbm-10.58.01/userguide/pamstereogram.html ---- netpbm-10.58.01/userguide/pamstereogram.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/pamstereogram.html 2012-04-09 15:42:52.971497399 +0200 +diff -up netpbm-10.58.03/userguide/pamstereogram.html.manfix netpbm-10.58.03/userguide/pamstereogram.html +--- netpbm-10.58.03/userguide/pamstereogram.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/pamstereogram.html 2012-06-22 09:53:54.176825013 +0200 @@ -1,5 +1,5 @@ --<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "DTD/xhtml11.dtd"> +-<!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<html> - <head> + <meta charset="UTF-8"> <title>Pamstereogram User Manual</title> -@@ -12,7 +12,7 @@ +@@ -11,7 +11,7 @@ - <p>Updated: 28 September 2010</p> + <p>Updated: 20 June 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.58.01/userguide/pamtoavs.html.manfix netpbm-10.58.01/userguide/pamtoavs.html ---- netpbm-10.58.01/userguide/pamtoavs.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/pamtoavs.html 2012-04-09 15:42:52.971497400 +0200 +diff -up netpbm-10.58.03/userguide/pamtoavs.html.manfix netpbm-10.58.03/userguide/pamtoavs.html +--- netpbm-10.58.03/userguide/pamtoavs.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/pamtoavs.html 2012-06-22 09:53:12.974340116 +0200 @@ -1,8 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> @@ -134,9 +134,9 @@ diff -up netpbm-10.58.01/userguide/pamtoavs.html.manfix netpbm-10.58.01/userguid </head> <body> -diff -up netpbm-10.58.01/userguide/pamtooctaveimg.html.manfix netpbm-10.58.01/userguide/pamtooctaveimg.html ---- netpbm-10.58.01/userguide/pamtooctaveimg.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/pamtooctaveimg.html 2012-04-09 15:42:52.971497400 +0200 +diff -up netpbm-10.58.03/userguide/pamtooctaveimg.html.manfix netpbm-10.58.03/userguide/pamtooctaveimg.html +--- netpbm-10.58.03/userguide/pamtooctaveimg.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/pamtooctaveimg.html 2012-06-22 09:53:12.974340116 +0200 @@ -1,8 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> @@ -148,9 +148,9 @@ diff -up netpbm-10.58.01/userguide/pamtooctaveimg.html.manfix netpbm-10.58.01/us </head> <body> -diff -up netpbm-10.58.01/userguide/pnmflip.html.manfix netpbm-10.58.01/userguide/pnmflip.html ---- netpbm-10.58.01/userguide/pnmflip.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/pnmflip.html 2012-04-09 15:42:52.971497400 +0200 +diff -up netpbm-10.58.03/userguide/pnmflip.html.manfix netpbm-10.58.03/userguide/pnmflip.html +--- netpbm-10.58.03/userguide/pnmflip.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/pnmflip.html 2012-06-22 09:53:12.975340104 +0200 @@ -4,9 +4,11 @@ <BODY> <H1>pnmflip</H1> @@ -163,9 +163,9 @@ diff -up netpbm-10.58.01/userguide/pnmflip.html.manfix netpbm-10.58.01/userguide <P><B>pamflip</b> is mostly backward compatible with <b>pnmflip</b>, but works on PAM images too. -diff -up netpbm-10.58.01/userguide/pnmmercator.html.manfix netpbm-10.58.01/userguide/pnmmercator.html ---- netpbm-10.58.01/userguide/pnmmercator.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/pnmmercator.html 2012-04-09 15:42:52.972497387 +0200 +diff -up netpbm-10.58.03/userguide/pnmmercator.html.manfix netpbm-10.58.03/userguide/pnmmercator.html +--- netpbm-10.58.03/userguide/pnmmercator.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/pnmmercator.html 2012-06-22 09:53:12.975340104 +0200 @@ -1,7 +1,6 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> @@ -175,18 +175,18 @@ diff -up netpbm-10.58.01/userguide/pnmmercator.html.manfix netpbm-10.58.01/userg <title>PnmMercator User Manual</title> </head> <body> -diff -up netpbm-10.58.01/userguide/pnmtotiff.html.manfix netpbm-10.58.01/userguide/pnmtotiff.html ---- netpbm-10.58.01/userguide/pnmtotiff.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/pnmtotiff.html 2012-04-09 15:42:52.972497387 +0200 +diff -up netpbm-10.58.03/userguide/pnmtotiff.html.manfix netpbm-10.58.03/userguide/pnmtotiff.html +--- netpbm-10.58.03/userguide/pnmtotiff.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/pnmtotiff.html 2012-06-22 09:53:12.975340104 +0200 @@ -1,5 +1,4 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<!> <html><head> <title>pnmtotiff</title> </head><body> -diff -up netpbm-10.58.01/userguide/ppmtogif.html.manfix netpbm-10.58.01/userguide/ppmtogif.html ---- netpbm-10.58.01/userguide/ppmtogif.html.manfix 2012-04-09 15:31:58.000000000 +0200 -+++ netpbm-10.58.01/userguide/ppmtogif.html 2012-04-09 15:44:34.918222888 +0200 +diff -up netpbm-10.58.03/userguide/ppmtogif.html.manfix netpbm-10.58.03/userguide/ppmtogif.html +--- netpbm-10.58.03/userguide/ppmtogif.html.manfix 2012-06-22 09:29:07.000000000 +0200 ++++ netpbm-10.58.03/userguide/ppmtogif.html 2012-06-22 09:53:12.975340104 +0200 @@ -4,11 +4,14 @@ <BODY> <H1>ppmtogif</H1> diff --git a/netpbm.spec b/netpbm.spec index f460d6d..604e4ca 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats Name: netpbm -Version: 10.58.01 -Release: 3%{?dist} +Version: 10.58.03 +Release: 1%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain Group: System Environment/Libraries @@ -250,6 +250,10 @@ rm -rf $RPM_BUILD_ROOT %doc userguide/* %changelog +* Fri Jun 22 2012 Jindrich Novy <jnovy@redhat.com> 10.58.03-1 +- update to 10.58.03 +- pnmtops is back + * Wed Jun 13 2012 Jindrich Novy <jnovy@redhat.com> 10.58.01-3 - fix ppmtopict buffer underflow - fix memory corruption in pnmtopclxl diff --git a/sources b/sources index e1ee852..15d9369 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b2aad8289006861eddd12e786046eb2 netpbm-10.58.01.tar.xz +11dd22eb2db67bd8149bb7d11cca6188 netpbm-10.58.03.tar.xz