diff --git a/netpbm-manfix.patch b/netpbm-manfix.patch
new file mode 100644
index 0000000..691fffd
--- /dev/null
+++ 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 @@
+-
+-
++
++
+
+ Avstopam User Manual
+-
+
+
+
+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 @@
+ Escp2topbm User Manual
+
+ escp2topbm
+-Created: 1 August 2003
++Updated: 1 August 2003
+
+ Table Of Contents
+
++NAME
+ escp2topbm - convert an ESC/P2 printer file to a PBM image
+
+ SYNOPSIS
+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
+
+
++SYNOPSIS
+ This page, part of the Netpbm user's guide,
+ describes FAX formats in relation to Netpbm facilities.
+
+
++
DESCRIPTION
+ 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 @@
+
+-
++
+
+ Pampaintspill User Manual
+-
+
+
+
+@@ -11,6 +10,7 @@
+
+ Table Of Contents
+
++NAME
+ pampaintspill - smoothly spill colors into the background
+
+
+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 @@
+-
++
+
+
+ Pamrecolor User Manual
+-
+
+
+
+@@ -11,7 +10,7 @@
+
+ Updated: 31 July 2010
+
+-Table Of Contents
++Table Of Contents
+
+
+ NAME
+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 @@
+
+-
++
+
+ Pamsistoaglyph User Manual
+-
+
+
+
+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 @@
+-
+-
++
++
+
+
+ Pamstereogram User Manual
+@@ -12,7 +12,7 @@
+
+ Updated: 28 September 2010
+
+-Table Of Contents
++Table Of Contents
+
+
+ NAME
+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 @@
+-
+-
++
++
+
+ Pamtoavs User Manual
+-
+
+
+
+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 @@
+-
+-
++
++
+
+ Pamtooctaveimg User Manual
+-
+
+
+
+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 @@
+
+ pnmflip
+
++NAME
+ pnmflip was replaced in Netpbm 10.13 (December 2002) by
+ pamflip.
+
++
DESCRIPTION
+ pamflip is mostly backward compatible with pnmflip,
+ 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 @@
+-
++
+
+
+-
+ PnmMercator User Manual
+
+
+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 @@
+
+-
+
+ pnmtotiff
+
+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 @@
+
+ ppmtogif
+
++NAME
+ ppmtogif was replaced in Netpbm 10.37 (December 2002) by
+ pamtogif.
+
++
SYNOPSIS
+ pamtogif is mostly backward compatible with ppmtogif.
+
++
DESCRIPTION
+ One way pamtogif is not backward compatible with ppmtogif
+ is that to specify a transparency (alpha) mask with ppmtogif, you
+ supply the transparency as a separate pseudo-PGM image and use the
diff --git a/netpbm.spec b/netpbm.spec
index a41f58b..f5a04e6 100644
--- 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 10.47.21-2
+- fix HTML pages from which man pages are now generated correctly (#644248)
+
* Fri Oct 18 2010 Jindrich Novy 10.47.21-1
- update to 10.47.21