fix HTML pages from which man pages are now generated correctly (#644248)

2010-10-19 13:38:17 +02:00 · 2010-10-19 13:38:17 +02:00 · 810b36f3be
commit 810b36f3be
parent c601be394d
2 changed files with 210 additions and 1 deletions
--- a/netpbm-manfix.patch
+++ b/netpbm-manfix.patch
@ -0,0 +1,204 @@
+diff -up netpbm-10.47.21/userguide/avstopam.html.manfix netpbm-10.47.21/userguide/avstopam.html
+--- netpbm-10.47.21/userguide/avstopam.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/avstopam.html	2010-10-19 13:26:14.553008174 +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">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+ <head>
+ <title>Avstopam User Manual</title>
+-<meta http-equiv="content-type" content="text/html; charset=us-ascii" />
+ </head>
+ 
+ <body>
+diff -up netpbm-10.47.21/userguide/escp2topbm.html.manfix netpbm-10.47.21/userguide/escp2topbm.html
+--- netpbm-10.47.21/userguide/escp2topbm.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/escp2topbm.html	2010-10-19 13:26:14.553008174 +0200
+@@ -2,10 +2,11 @@
+ <HTML><HEAD><TITLE>Escp2topbm User Manual</TITLE></HEAD>
+ <BODY>
+ <H1>escp2topbm</H1>
+-Created: 1 August 2003
+Updated: 1 August 2003
+ <BR>
+ <A HREF="#index">Table Of Contents</A>
+ 
+<H2>NAME</H2>
+ escp2topbm - convert an ESC/P2 printer file to a PBM image
+ 
+ <H2 id="synopsis">SYNOPSIS</H2>
+diff -up netpbm-10.47.21/userguide/faxformat.html.manfix netpbm-10.47.21/userguide/faxformat.html
+--- netpbm-10.47.21/userguide/faxformat.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/faxformat.html	2010-10-19 13:30:27.134202295 +0200
+@@ -5,10 +5,12 @@
+ Updated: 03 December 2008
+ <BR>
+ 
+<H2>SYNOPSIS</H2>
+ <p>This page, part of the <a href="index.html">Netpbm user's guide</a>,
+ describes FAX formats in relation to Netpbm facilities.
+ 
+ 
+<H2>DESCRIPTION</H2>
+ <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.47.21/userguide/pampaintspill.html.manfix netpbm-10.47.21/userguide/pampaintspill.html
+--- netpbm-10.47.21/userguide/pampaintspill.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/pampaintspill.html	2010-10-19 13:26:14.554008174 +0200
+@@ -1,8 +1,7 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
+ <head>
+ <title>Pampaintspill User Manual</title>
+-<meta http-equiv="content-type" content="text/html; charset=us-ascii" />
+ </head>
+ 
+ <body>
+@@ -11,6 +10,7 @@
+ 
+ <p><a href="#index">Table Of Contents</a></p>
+ 
+<H2>NAME</H2>
+ <p>pampaintspill - smoothly spill colors into the background</p>
+ 
+ <h2><a name="synopsis">SYNOPSIS</a></h2>
+diff -up netpbm-10.47.21/userguide/pamrecolor.html.manfix netpbm-10.47.21/userguide/pamrecolor.html
+--- netpbm-10.47.21/userguide/pamrecolor.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/pamrecolor.html	2010-10-19 13:26:14.554008174 +0200
+@@ -1,8 +1,7 @@
+-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+ <html>
+ <head>
+ <title>Pamrecolor User Manual</title>
+-<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+ </head>
+ 
+ <body>
+@@ -11,7 +10,7 @@
+ 
+ <p>Updated: 31 July 2010</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.47.21/userguide/pamsistoaglyph.html.manfix netpbm-10.47.21/userguide/pamsistoaglyph.html
+--- netpbm-10.47.21/userguide/pamsistoaglyph.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/pamsistoaglyph.html	2010-10-19 13:26:14.555008174 +0200
+@@ -1,8 +1,7 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
+ <head>
+ <title>Pamsistoaglyph User Manual</title>
+-<meta http-equiv="content-type" content="text/html; charset=us-ascii" />
+ </head>
+ 
+ <body>
+diff -up netpbm-10.47.21/userguide/pamstereogram.html.manfix netpbm-10.47.21/userguide/pamstereogram.html
+--- netpbm-10.47.21/userguide/pamstereogram.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/pamstereogram.html	2010-10-19 13:26:14.555008174 +0200
+@@ -1,5 +1,5 @@
+-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "DTD/xhtml11.dtd">
+-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+ 
+ <head>
+ <title>Pamstereogram User Manual</title>
+@@ -12,7 +12,7 @@
+ 
+ <p>Updated: 28 September 2010</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.47.21/userguide/pamtoavs.html.manfix netpbm-10.47.21/userguide/pamtoavs.html
+--- netpbm-10.47.21/userguide/pamtoavs.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/pamtoavs.html	2010-10-19 13:26:14.556008174 +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">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+ <head>
+ <title>Pamtoavs User Manual</title>
+-<meta http-equiv="content-type" content="text/html; charset=us-ascii" />
+ </head>
+ 
+ <body>
+diff -up netpbm-10.47.21/userguide/pamtooctaveimg.html.manfix netpbm-10.47.21/userguide/pamtooctaveimg.html
+--- netpbm-10.47.21/userguide/pamtooctaveimg.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/pamtooctaveimg.html	2010-10-19 13:26:14.557008174 +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">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+ <head>
+ <title>Pamtooctaveimg User Manual</title>
+-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ </head>
+ 
+ <body>
+diff -up netpbm-10.47.21/userguide/pnmflip.html.manfix netpbm-10.47.21/userguide/pnmflip.html
+--- netpbm-10.47.21/userguide/pnmflip.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/pnmflip.html	2010-10-19 13:32:04.939317059 +0200
+@@ -4,9 +4,11 @@
+ <BODY>
+ <H1>pnmflip</H1>
+ <BR>
+<H2>NAME</H2>
+ <p><b>pnmflip</b> was replaced in Netpbm 10.13 (December 2002) by
+ <b><a href="pamflip.html">pamflip</a></b>.
+ 
+<H2>DESCRIPTION</H2>
+ <P><B>pamflip</b> is mostly backward compatible with <b>pnmflip</b>,
+ but works on PAM images too.
+ 
+diff -up netpbm-10.47.21/userguide/pnmmercator.html.manfix netpbm-10.47.21/userguide/pnmmercator.html
+--- netpbm-10.47.21/userguide/pnmmercator.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/pnmmercator.html	2010-10-19 13:26:14.557008174 +0200
+@@ -1,7 +1,6 @@
+-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+ <html>
+ <head>
+-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+ <title>PnmMercator User Manual</title>
+ </head>
+ <body>
+diff -up netpbm-10.47.21/userguide/pnmtotiff.html.manfix netpbm-10.47.21/userguide/pnmtotiff.html
+--- netpbm-10.47.21/userguide/pnmtotiff.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/pnmtotiff.html	2010-10-19 13:26:14.558008174 +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.47.21/userguide/ppmtogif.html.manfix netpbm-10.47.21/userguide/ppmtogif.html
+--- netpbm-10.47.21/userguide/ppmtogif.html.manfix	2010-10-18 07:23:41.000000000 +0200
+++ netpbm-10.47.21/userguide/ppmtogif.html	2010-10-19 13:26:14.558008174 +0200
+@@ -4,11 +4,14 @@
+ <BODY>
+ <H1>ppmtogif</H1>
+ <BR>
+<H2>NAME</H2>
+ <p><b>ppmtogif</b> was replaced in Netpbm 10.37 (December 2002) by
+ <b><a href="pamtogif.html">pamtogif</a></b>.
+ 
+<H2>SYNOPSIS</H2>
+ <P><B>pamtogif</b> is mostly backward compatible with <b>ppmtogif</b>.
+ 
+<H2>DESCRIPTION</H2>
+ <P>One way <b>pamtogif</b> is not backward compatible with <b>ppmtogif</b>
+ is that to specify a transparency (alpha) mask with <b>ppmtogif</b>, you
+ supply the transparency as a separate pseudo-PGM image and use the
--- a/netpbm.spec
+++ b/netpbm.spec
@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
 Version: 10.47.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@ -33,6 +33,7 @@ Patch19: netpbm-pnmmontagefix.patch
 Patch20: netpbm-noppmtompeg.patch
 Patch21: netpbm-cmuwtopbm.patch
 Patch22: netpbm-pamtojpeg2k.patch
+Patch23: netpbm-manfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@ -108,6 +109,7 @@ netpbm-doc.  You'll also need to install the netpbm-progs package.
 %patch20 -p1 -b .noppmtompeg
 %patch21 -p1 -b .cmuwtopbmfix
 %patch22 -p1 -b .pamtojpeg2kfix
+%patch23 -p1 -b .manfix

 sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 rm -rf converter/other/jpeg2000/libjasper/
@ -251,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc userguide/*

 %changelog
+* Tue Oct 19 2010 Jindrich Novy <jnovy@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@redhat.com> 10.47.21-1
 - update to 10.47.21