Merge branch 'master' into f29

Solve merge issue
Package %{_libdir}/*.so (RHBZ#1676370).
2019-08-21 11:11:07 +02:00 · 2019-04-17 11:12:31 +02:00 · 2019-02-13 10:55:06 +01:00
19 changed files with 4363 additions and 2956 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,20 +13,3 @@
 /netpbm-10.84.03.tar.xz
 /netpbm-10.86.00.tar.xz
 /netpbm-10.87.00.tar.xz
-/netpbm-10.88.00.tar.xz
-/netpbm-10.89.00.tar.xz
-/netpbm-10.90.00.tar.xz
-/netpbm-10.92.00.tar.xz
-/netpbm-10.93.00.tar.xz
-/netpbm-10.94.05.tar.xz
-/netpbm-10.95.00.tar.xz
-/netpbm-10.96.00.tar.xz
-/netpbm-10.97.00.tar.xz
-/netpbm-10.99.00.tar.xz
-/netpbm-11.00.00.tar.xz
-/netpbm-11.01.00.tar.xz
-/netpbm-11.02.00.tar.xz
-/netpbm-11.09.00.tar.xz
-/netpbm-11.10.00.tar.xz
-/netpbm-11.12.00.tar.xz
-/netpbm-11.13.00.tar.xz
--- a/fix.patch
+++ b/fix.patch
--- a/netpbm-CAN-2005-2471.patch
+++ b/netpbm-CAN-2005-2471.patch
@ -1,7 +1,8 @@
-diff -urNp a/converter/other/pstopnm.c b/converter/other/pstopnm.c
--- a/converter/other/pstopnm.c	2025-02-04 10:47:27.857451432 +0100
-+++ b/converter/other/pstopnm.c	2025-02-04 10:55:56.430470597 +0100
-@@ -896,11 +896,11 @@ execGhostscript(int               const
+diff --git a/converter/other/pstopnm.c b/converter/other/pstopnm.c
+index f534265..2ab48ab 100644
+--- a/converter/other/pstopnm.c
+++ b/converter/other/pstopnm.c
+@@ -896,11 +896,11 @@ execGhostscript(int               const inputPipeFd,
                    ghostscriptProg, arg0,
                    deviceopt, outfileopt, gopt, ropt, textalphabitsopt,
                    "-q", "-dNOPAUSE",
@ -9,9 +10,10 @@ diff -urNp a/converter/other/pstopnm.c b/converter/other/pstopnm.c
 +                   "-dPARANOIDSAFER", "-");
     }
 
-     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt,
-          textalphabitsopt, "-q", "-dNOPAUSE", "-dSAFER", "-", NULL);
-+          "-q", "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
+-    execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, 
+-	  textalphabitsopt, "-q", "-dNOPAUSE", "-dSAFER", "-", NULL);
+    execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
+          "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
 
     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
              ghostscriptProg, errno, strerror(errno));
--- a/netpbm-c99.patch
+++ b/netpbm-c99.patch
@ -1,41 +0,0 @@
-Remove the contents of libjasper_compat.c.  The assignment
-
-        *errorP  = errorP;
-
-is bogus because it creates a non-null value in *errorP even on
-success, and the caller expects a null pointer int his case.
-
-The source file is compiled, but not actually linked in, so this is
-only a problem because of the type error that fails the build.
-
-diff --git a/converter/other/jpeg2000/libjasper_compat.c b/converter/other/jpeg2000/libjasper_compat.c
-index 101820a321212dc6..e69de29bb2d1d643 100644
--- a/converter/other/jpeg2000/libjasper_compat.c
-+++ b/converter/other/jpeg2000/libjasper_compat.c
-@@ -1,26 +0,0 @@
-#include "netpbm/nstring.h"
-
-#include "jasper/jasper.h"
-#include "jasper/jas_image.h"
-
-#ifndef JAS_HAVE_PMJAS_IMAGE_DECODE
-
-void
-pmjas_image_decode(jas_stream_t * const in,
-                   int            const fmtArg,
-                   const char *   const optstr,
-                   jas_image_t ** const imagePP,
-                   const char **  const errorP) {
-
-    jas_image_t * const jasperP = jas_image_decode(in, fmtArg, optstr);
-
-    if (jasperP) {
-        *imagePP = jasperP;
-        *errorP  = errorP;
-    } else {
-        pm_asprintf(errorP, "Failed.  Details may have been written to "
-                    "Standard Error");
-    }
-}
-
-#endif
--- a/netpbm-cmuwtopbm.patch
+++ b/netpbm-cmuwtopbm.patch
@ -0,0 +1,21 @@
+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.
+ */
+ 
+-
+#include <stdint.h>
+ #include "pbm.h"
+ 
+ /*--------------------------
+@@ -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;
+     short s;
+     int rc;
+ 
--- a/netpbm-docfix.patch
+++ b/netpbm-docfix.patch
@ -1,21 +1,7 @@
-diff --git a/converter/pbm/pbmtoepson.c b/converter/pbm/pbmtoepson.c
-index 122a438..5d67746 100644
--- a/converter/pbm/pbmtoepson.c
-+++ b/converter/pbm/pbmtoepson.c
-@@ -75,7 +75,7 @@ parseCommandLine(int                  argc,
-             &dpiSpec,                         0);
-     OPTENT3(0, "adjacent",     OPT_FLAG,     NULL,
-             &adjacentSpec,                    0);
-    OPTENT3(0, "nonadjacent",  OPT_FLAG,     NULL,
-+    OPTENT3(0, "noadjacent",  OPT_FLAG,     NULL,
-             &nonadjacentSpec,                 0);
- 
-     opt.opt_table = option_def;
-diff --git a/userguide/cameratopam.html b/userguide/cameratopam.html
-index b50bfeb..3af9008 100644
--- a/userguide/cameratopam.html
-+++ b/userguide/cameratopam.html
-@@ -24,10 +24,10 @@ cameratopam - convert raw camera image to PAM
+diff -urNp old/userguide/cameratopam.html new/userguide/cameratopam.html
+--- old/userguide/cameratopam.html	2017-09-05 09:05:16.000000000 +0200
+++ new/userguide/cameratopam.html	2017-09-05 13:16:33.622352535 +0200
+@@ -25,10 +25,10 @@ cameratopam - convert raw camera image t
 [<b>-balance_camera</b>]
 [<b>-red_scale=</b><i>float</i>]
 [<b>-blue_scale=</b><i>float</i>]
@ -28,7 +14,7 @@ index b50bfeb..3af9008 100644
 [<b>-linear</b>]
 [<b>-verbose</b>]
 
-@@ -110,7 +110,7 @@ the default.
+@@ -106,7 +106,7 @@ the default.
 <dd>Further adjust the color balance by multiplying the red and blue
 channels by these values.  Both default to 1.0.
 
@ -37,7 +23,7 @@ index b50bfeb..3af9008 100644
 
 <dd>Change the output brightness.  Default is 1.0.
 
-@@ -118,14 +118,14 @@ channels by these values.  Both default to 1.0.
+@@ -114,14 +114,14 @@ channels by these values.  Both default
 
 <dd>By default, <b>cameratoapm</b> clips all colors to prevent pink
 hues in the highlights.  Combine this option with
@ -54,49 +40,47 @@ index b50bfeb..3af9008 100644
 
 <dd>For cameras based on the Fuji Super CCD SR, this option causes
 <b>cameratopam</b> to use the secondary sensors, in effect
-diff --git a/userguide/fiascotopnm.html b/userguide/fiascotopnm.html
-index c33f701..fa84441 100644
--- a/userguide/fiascotopnm.html
-+++ b/userguide/fiascotopnm.html
-@@ -56,7 +56,7 @@ the output file(s) are written to the first (writable) directory of
+diff -urNp old/userguide/fiascotopnm.html new/userguide/fiascotopnm.html
+--- old/userguide/fiascotopnm.html	2017-09-05 09:05:16.000000000 +0200
+++ new/userguide/fiascotopnm.html	2017-09-05 13:32:51.810458154 +0200
+@@ -51,7 +51,7 @@ the output file(s) are written to the fi
 this list. Otherwise, the current directory is used to store the
 output file(s).
 
-<dt><b>-z</b>, <b>--fast</b>
-+<dt><b>-r</b>, <b>--fast</b>
- <dd>
+-<DT><B>-z</B>, <B>--fast</B>
+<DT><B>-r</B>, <B>--fast</B>
+ <DD>
 Decompress images in the 4:2:0 format; i.e., each chroma channel is
 decompressed to an image of halved width and height. Use this option
-@@ -88,7 +88,7 @@ given amount <i>N</i>. <i>N</i> is 1 (minimum) to 100 (maximum); default
- is 70. When <i>N</i>=0, then the smoothing amount specified in the
+@@ -83,7 +83,7 @@ given amount <I>N</I>. <I>N</I> is 1 (mi
+ is 70. When <I>N</I>=0, then the smoothing amount specified in the
 FIASCO file is used (defined by the FIASCO coder).
 
-<dt><b>-F</b> <i>N</i>, <b>--fps=</b><i>N</i>
-+<dt><b>-F</b> <i>N</i>, <b>--framerate=</b><i>N</i>
- <dd>
- Set number of frames per second to <i>N</i>. When using this option,
+-<DT><B>-F</B> <I>N</I>, <B>--fps=</B><I>N</I>
+<DT><B>-F</B> <I>N</I>, <B>--framerate=</B><I>N</I>
+ <DD>
+ Set number of frames per second to <I>N</I>. When using this option,
 the frame rate specified in the FIASCO file is overridden.
-@@ -118,13 +118,8 @@ following methods (in the specified order):
- <li>--config=<i>name</i>
- </ol>
+@@ -113,13 +113,8 @@ following methods (in the specified orde
+ <LI>--config=<I>name</I>
+ </OL>
 
-<dt><b>-h</b>, <b>--info</b>
-<dd>
+-<DT><B>-h</B>, <B>--info</B>
+-<DD>
 -Print brief help, then exit.
 -
-<dt><b>-H</b>, <b>--help</b>
-<dd>
+-<DT><B>-H</B>, <B>--help</B>
+-<DD>
 -Print detailed help, then exit.
-+<dt><b>-h</b>, <b>--help</b>
+<DT><B>-h</B>, <B>--help</B>
 +Print help, then exit.
 
- </dl>
+ </DL>
 
-diff --git a/userguide/pamperspective.html b/userguide/pamperspective.html
-index 018f18a..13073d2 100644
--- a/userguide/pamperspective.html
-+++ b/userguide/pamperspective.html
-@@ -223,7 +223,7 @@ default rectangle as the "frame." The visible part is always
+diff -urNp old/userguide/pamperspective.html new/userguide/pamperspective.html
+--- old/userguide/pamperspective.html	2017-09-05 09:05:16.000000000 +0200
+++ new/userguide/pamperspective.html	2017-09-05 13:23:15.869997105 +0200
+@@ -220,7 +220,7 @@ default rectangle as the "frame." The vi
 a rectangle the axes of which are parallel to those of the frame.
 
 <p>The frame options are additive.  All the parts of the image
@ -105,20 +89,31 @@ index 018f18a..13073d2 100644
 <b>--include</b> (or their defaults) are in the visible part.  The
 visible part is the smallest possible rectangle that contains the
 parts specified those three ways.
-diff --git a/userguide/pbmtoepson.html b/userguide/pbmtoepson.html
-index baacf7b..e74a7fe 100644
--- a/userguide/pbmtoepson.html
-+++ b/userguide/pbmtoepson.html
-@@ -16,7 +16,7 @@ pbmtoepson - convert a PBM image into Epson printer graphics
+diff -urNp old/converter/pbm/pbmtoepson.c new/converter/pbm/pbmtoepson.c
+--- old/converter/pbm/pbmtoepson.c	2018-01-04 14:26:14.740024843 +0100
+++ new/converter/pbm/pbmtoepson.c	2018-01-04 14:28:47.970518766 +0100
+@@ -75,7 +75,7 @@ parseCommandLine(int                  ar
+             &dpiSpec,                         0);
+     OPTENT3(0, "adjacent",     OPT_FLAG,     NULL,
+             &adjacentSpec,                    0);
+-    OPTENT3(0, "nonadjacent",  OPT_FLAG,     NULL,
+    OPTENT3(0, "noadjacent",  OPT_FLAG,     NULL,
+             &nonadjacentSpec,                 0);
+ 
+     opt.opt_table = option_def;
+diff -urNp old/userguide/pbmtoepson.html new/userguide/pbmtoepson.html
+--- old/userguide/pbmtoepson.html	2018-01-04 14:26:14.586024719 +0100
+++ new/userguide/pbmtoepson.html	2018-01-04 14:27:56.466847698 +0100
+@@ -18,7 +18,7 @@ pbmtoepson - convert a PBM image into Ep
 [<b>-dpi=</b><i>n</i>]
- [<b>-protocol=</b>{<b>escp9</b>|<b>escp</b>}]
+ [<b>-protocol=</b>{<b>escp9</b>|<B>escp</B>}]
 [<b>-adjacent</b>]
 -[<b>-nonadjacent</b>]
 +[<b>-noadjacent</b>]
 
- [<i>pbmfile</i>]
+ [<I>pbmfile</I>]
 
-@@ -75,7 +75,7 @@ print density for you consistent with your other options.
+@@ -74,7 +74,7 @@ print density for you consistent with yo
 <p>This option was new in Netpbm 10.23 (July 2004).     
 
 <dt><b>-adjacent</b>
--- a/netpbm-fiasco-overflow.patch
+++ b/netpbm-fiasco-overflow.patch
@ -0,0 +1,12 @@
+diff -up netpbm-10.47.09/converter/other/fiasco/lib/image.h.fiasco-overflow netpbm-10.47.09/converter/other/fiasco/lib/image.h
+--- netpbm-10.47.09/converter/other/fiasco/lib/image.h.fiasco-overflow	2010-01-25 09:00:48.000000000 +0100
+++ netpbm-10.47.09/converter/other/fiasco/lib/image.h	2010-01-27 10:29:48.000000000 +0100
+@@ -29,7 +29,7 @@ typedef struct image
+  *  Image data
+  */
+ {
+-   char      id [7];
+   char      id [8];
+    unsigned  reference_count;
+    unsigned  width;			/* Width of the image */
+    unsigned  height;			/* Height of the image */
--- a/netpbm-glibc.patch
+++ b/netpbm-glibc.patch
@ -1,10 +1,9 @@
-diff -urNp a/converter/other/pnmtotiffcmyk.c b/converter/other/pnmtotiffcmyk.c
--- a/converter/other/pnmtotiffcmyk.c	2025-02-04 10:47:27.858451429 +0100
-+++ b/converter/other/pnmtotiffcmyk.c	2025-02-04 11:04:46.118394226 +0100
-@@ -989,8 +989,8 @@ int main( int argc, char **argv ) {
+--- netpbm-10.35/converter/other/pnmtotiffcmyk.c.glibc	2006-09-18 12:20:06.000000000 +0200
+++ netpbm-10.35/converter/other/pnmtotiffcmyk.c	2007-08-23 09:18:30.000000000 +0200
+@@ -974,8 +974,8 @@ int main( int argc, char **argv ) {
 
   if ( (err = parseOpts( argc, argv, rt )) ) goto exit ;
- 
+   
 -  if ( (err = rt->in->open( rt->in, rt )) ) goto exit ;
 -  if ( (err = rt->out->open( rt->out, rt )) ) goto exit ;
 +  if ( (err = (rt->in->open)( rt->in, rt )) ) goto exit ;
--- a/netpbm-manfix.patch
+++ b/netpbm-manfix.patch
@ -1,709 +1,184 @@
-diff -urNp a/userguide/avstopam.html b/userguide/avstopam.html
--- a/userguide/avstopam.html	2025-02-04 10:47:27.823451565 +0100
-+++ b/userguide/avstopam.html	2025-02-04 17:49:34.981978989 +0100
-@@ -2,9 +2,9 @@
- <html><head><title>Avstopam User Manual</title></head>
+diff -urNp old/userguide/avstopam.html new/userguide/avstopam.html
+--- old/userguide/avstopam.html	2017-09-05 13:58:08.338559550 +0200
+++ new/userguide/avstopam.html	2017-09-05 14:00:27.371039472 +0200
+@@ -1,8 +1,7 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html>
+ <head>
+ <title>Avstopam User Manual</title>
+-<meta http-equiv="content-type" content="text/html; charset=us-ascii" />
+ </head>
+ 
 <body>
- <h1>avstopam</h1>
-Updated: 07 February 2010
-<br>
-<a href="#index">Table Of Contents</a>
-+<p>Updated: 07 February 2010</p>
-+
-+<p><a href="#index">Table Of Contents</a></p>
- <h2>NAME</h2>
+diff -urNp old/userguide/escp2topbm.html new/userguide/escp2topbm.html
+--- old/userguide/escp2topbm.html	2017-09-05 13:58:08.335559561 +0200
+++ new/userguide/escp2topbm.html	2017-09-05 14:01:20.226842694 +0200
+@@ -6,6 +6,7 @@ Updated: 14 July 2015
+ <BR>
+ <A HREF="#index">Table Of Contents</A>
 
- <p>avstopam - convert an AVS X image to a Netpbm image
-@@ -16,40 +16,40 @@ Updated: 07 February 2010
+<H2>NAME</H2>
+ escp2topbm - convert an ESC/P2 printer file to a PBM image
 
- <h2 id="description">DESCRIPTION</h2>
- 
-<p>This program is part of <a href="index.html">Netpbm</a>.
-+<p>This program is part of <a href="index.html">Netpbm</a>.</p>
- 
- <p><b>avstopam</b> reads a Stardent <abbr title="Application
- Visualization System">AVS</abbr> X image as input and produces a Netpbm
-image as output.
-+image as output.</p>
- 
- <p><i>avsfile</i> is the input file, which defaults to Standard Input.
-Output is always on Standard Output.
-+Output is always on Standard Output.</p>
- 
- <h2 id="options">OPTIONS</h2>
- 
- <p>There are no command line options defined specifically
- for <b>avstopam</b>, but it recognizes the options common to all
- programs based on libnetpbm (See <a href="index.html#commonoptions">
-Common Options</a>.)
-+Common Options</a>.)</p>
- 
- <h2 id="author">AUTHOR</h2>
- 
- <p>Copyright&nbsp;&copy; 2010 Scott Pakin,
-<a href="mailto:scott+pbm@pakin.org">scott+pbm@pakin.org</a>
-+<a href="mailto:scott+pbm@pakin.org">scott+pbm@pakin.org</a></p>
- 
- <h2 id="seealso">SEE ALSO</h2>
- 
-<p><a href="pamtoavs.html">pamtoavs</a>, <a href="pam.html">pam</a>
-+<p><a href="pamtoavs.html">pamtoavs</a>, <a href="pam.html">pam</a></p>
- 
- <hr>
- 
- <h2 id="index">Table Of Contents</h2>
- <ul>
-<li><a href="#synopsis">SYNOPSIS</a>
-<li><a href="#description">DESCRIPTION</a>
-<li><a href="#options">OPTIONS</a>
-<li><a href="#author">AUTHOR</a>
-<li><a href="#seealso">SEE ALSO</a>
-+<li><a href="#synopsis">SYNOPSIS</a></li>
-+<li><a href="#description">DESCRIPTION</a></li>
-+<li><a href="#options">OPTIONS</a></li>
-+<li><a href="#author">AUTHOR</a></li>
-+<li><a href="#seealso">SEE ALSO</a></li>
- </ul>
- </body>
- </html>
-diff -urNp a/userguide/faxformat.html b/userguide/faxformat.html
--- a/userguide/faxformat.html	2025-02-04 10:47:27.824451560 +0100
-+++ b/userguide/faxformat.html	2025-02-04 17:50:41.300631089 +0100
+ <H2 id="synopsis">SYNOPSIS</H2>
+diff -urNp old/userguide/faxformat.html new/userguide/faxformat.html
+--- old/userguide/faxformat.html	2017-09-05 13:58:08.337559553 +0200
+++ new/userguide/faxformat.html	2017-09-05 14:02:33.322571279 +0200
@@ -5,10 +5,11 @@
 Updated: 03 December 2008
- <br>
+ <BR>
 
-+<h2>SYNOPSIS</h2>
+<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>
+<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 -urNp a/userguide/libnetpbm_ug.html b/userguide/libnetpbm_ug.html
--- a/userguide/libnetpbm_ug.html	2025-02-04 10:47:27.824451560 +0100
-+++ b/userguide/libnetpbm_ug.html	2025-02-04 17:52:02.045207328 +0100
-@@ -374,7 +374,7 @@ plain format.
- <h2 id="reference">Reference</h2>
+diff -urNp old/userguide/pampaintspill.html new/userguide/pampaintspill.html
+--- old/userguide/pampaintspill.html	2017-09-05 13:58:08.338559550 +0200
+++ new/userguide/pampaintspill.html	2017-09-05 14:03:32.625351620 +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>
 
- <p>The <a href="libnetpbm_image.html">Libnetpbm Netpbm Image
-Processing Manual</a> describes the the <b>libnetpbm</b> functions for
-+Processing Manual</a> describes the <b>libnetpbm</b> functions for
- processing image data.
- 
- <p>The <a href="libpm.html">Libnetpbm Utility Manual</a>
-diff -urNp a/userguide/pamfunc.html b/userguide/pamfunc.html
--- a/userguide/pamfunc.html	2025-02-04 10:47:27.823451565 +0100
-+++ b/userguide/pamfunc.html	2025-02-04 17:52:19.661114878 +0100
-@@ -60,7 +60,7 @@ output image.
- and bit string (such as and with 01001000).  For the arithmetic functions, the
- function arguments and results are the fraction that a sample is of the
- maxval, i.e. normal interpretation of PAM tuples.  But for the bit string
-functions, the value is the the bit string whose value as a binary cipher is
-+functions, the value is the bit string whose value as a binary cipher is
- the sample value, and the maxval indicates the width of the bit string.
- 
- <h4>Arithmetic functions</h4>
-diff -urNp a/userguide/pammixmulti.html b/userguide/pammixmulti.html
--- a/userguide/pammixmulti.html	2025-02-04 10:47:27.820451577 +0100
-+++ b/userguide/pammixmulti.html	2025-02-04 17:56:58.538651212 +0100
-@@ -7,8 +7,8 @@ Updated: 18 December 2024
- <a href="#index">Table Of Contents</a>
-   
- 
-<h2>NAME</h2>
-<p>pammixmulti - blend together multiple PAM images
-+<h2 id="name">NAME</h2>
-+<p>pammixmulti - blend together multiple PAM images</p>
- 
- 
- <h2 id="synopsis">SYNOPSIS</h2>
-@@ -17,19 +17,19 @@ Updated: 18 December 2024
-   [<b>-maskfile</b>=<i>filename</i>]
-   [<b>-stdev</b>=<i>number</i>]
-   [<b>-randomseed</b> <i>integer</i>]
-  <i>filename</i> ...
-+  <i>filename</i> ...</p>
- 
- <p>Minimum unique abbreviation of an option is acceptable. You can use double
- hyphen instead of a single hyphen to denote options. You can use white
- space in place of the equals sign to separate an option name from its
-value.
-+value.</p>
- 
- 
- <h2 id="description">DESCRIPTION</h2>
-<p>This file is part of <a href="index.html">Netpbm</a>.
-+<p>This file is part of <a href="index.html">Netpbm</a>.</p>
- 
- <p><b>pammixmulti</b> mixes two or more images to produce a new image. The
-program provides multiple ways to interpret "mix."
-+program provides multiple ways to interpret "mix."</p>
- 
- 
- <h2 id="options">OPTIONS</h2>
-@@ -37,7 +37,7 @@ program provides multiple ways to interp
- <p>In addition to the options common to all programs based on libnetpbm
- (most notably <b>-quiet</b>, see <a href="index.html#commonoptions">
- Common Options</a>), <b>pammixmulti</b> recognizes the following
-command line options:
-+command line options:</p>
- 
- <dl compact>
- <dt><b>-blend</b>=average|alpha-weighted|random|mask</dt>
-@@ -55,8 +55,8 @@ of the input images, chosen at random on
- With <b>-blend</b>=<code>mask</code>, each pixel in the output is
- produced by a weighted average of the corresponding pixels from all
- the input images based on the grayscale level of an additional mask
-image.
-<p><b>-alpha-weighted</b> was new in Netpbm 11.09 (December 2024).
-+image.</p>
-+<p><b>-alpha-weighted</b> was new in Netpbm 11.09 (December 2024).</p>
- </dd>
- 
- <dt><b>-maskfile</b>=<i>filename</i></dt>
-@@ -66,7 +66,7 @@ grayscale mask file to control the blend
- not grayscale, the first channel is treated as gray).  Where the mask file is
- black, the first image is selected. Where the mask file is white, the last
- image is selected.  Intermediate levels of gray select intermediate
-images.
-+images.</p>
- </dd>
- 
- <dt><b>-stdev</b>=<i>number</i></dt>
-@@ -83,7 +83,7 @@ that includes roughly equal amounts of t
- and 2 but less of the corresponding pixel from image 3.  As <i>number</i>
- tends towards the number of input images (going beyond that has diminishing
- impact), the output tends to look more
-like <b>-blend</b>=average. <i>number</i> defaults to 0.25.
-+like <b>-blend</b>=average. <i>number</i> defaults to 0.25.</p>
- </dd>
- 
- <dt><b>-randomseed</b> <i>integer</i>
-@@ -91,45 +91,45 @@ like <b>-blend</b>=average. <i>number</i
- <dd>This is the seed for the random number generator used with
- <b>-blend=random</b>
- 
-<p>Use this to ensure you get the same image on separate invocations.
-+<p>Use this to ensure you get the same image on separate invocations.</p>
- 
- </dl>
- 
- <h2 id="arguments">ARGUMENTS</h2>
- 
-<p>You supply the names of the files to mix as non-option arguments.
-+<p>You supply the names of the files to mix as non-option arguments.</p>
- 
- 
- <h2 id="examples">EXAMPLES</h2>
- 
-<p>Average a bunch of PPM images to produce a new PAM image:
-+<p>Average a bunch of PPM images to produce a new PAM image:</p>
- <pre><code>
-     pammixmulti input*.ppm &gt;output.ppm
- </code></pre>
- 
- <p>Mix these same images by taking each pixel from a randomly selected input
-image:
-+image:</p>
- 
- <pre><code>
-     pammixmulti -blend=random input*.ppm &gt;output.ppm
- </code></pre>
- 
- <p>Use a mask image to control the fading among input images on a
-pixel-by-pixel basis:
-+pixel-by-pixel basis:</p>
- 
- <pre><code>
-     pammixmulti -blend=mask -maskfile=mask.pgm &gt;output.pam \
-        one.pam two.pam three.pam four.pam
- </code></pre>
- 
-<p>Do the same but with more abrupt transitions:
-+<p>Do the same but with more abrupt transitions:</p>
- 
- <pre><code>
-     pammixmulti -blend=mask -maskfile=mask.pgm -stdev=0.0 &gt;output.pam \
-        one.pam two.pam three.pam four.pam
- </code></pre>
- 
-<p>and now with more gradual transitions:
-+<p>and now with more gradual transitions:</p>
- 
- <pre><code>
-     pammixmulti -blend=mask -maskfile=mask.pgm -stdev=1.0 &gt;output.pam \
-@@ -139,12 +139,12 @@ pixel-by-pixel basis:
- 
- <h2 id="history">HISTORY</h2>
- 
-<p><b>pammixmulti</b> was new in Netpbm 10.85 (December 2018).
-+<p><b>pammixmulti</b> was new in Netpbm 10.85 (December 2018).</p>
- 
- 
- <h2 id="author">AUTHOR</h2>
- 
-<p>Copyright 2018&ndash;2024 Scott Pakin, scott+pbm@pakin.org.
-+<p>Copyright 2018&ndash;2024 Scott Pakin, scott+pbm@pakin.org.</p>
- 
- <h2 id="seealso">SEE ALSO</h2>
- 
-@@ -152,20 +152,20 @@ pixel-by-pixel basis:
- <a href="ppmmix.html">ppmmix</a>,
- <a href="pamarith.html">pamarith</a>,
- <a href="pnm.html">pnm</a>,
-<a href="pam.html">pam</a>
-+<a href="pam.html">pam</a></p>
- 
- 
- <h2 id="index">Table Of Contents</h2>
- 
- <ul>
-<li><a href="#synopsis">SYNOPSIS</a>
-<li><a href="#description">DESCRIPTION</a>
-<li><a href="#options">OPTIONS</a>
-<li><a href="#arguments">ARGUMENTS</a>
-<li><a href="#examples">EXAMPLES</a>
-<li><a href="#history">HISTORY</a>
-<li><a href="#author">AUTHOR</a>
-<li><a href="#seealso">SEE ALSO</a>
-+<li><a href="#synopsis">SYNOPSIS</a></li>
-+<li><a href="#description">DESCRIPTION</a></li>
-+<li><a href="#options">OPTIONS</a></li>
-+<li><a href="#arguments">ARGUMENTS</a></li>
-+<li><a href="#examples">EXAMPLES</a></li>
-+<li><a href="#history">HISTORY</a></li>
-+<li><a href="#author">AUTHOR</a></li>
-+<li><a href="#seealso">SEE ALSO</a></li>
- </ul>
- 
- </body>
-diff -urNp a/userguide/pampaintspill.html b/userguide/pampaintspill.html
--- a/userguide/pampaintspill.html	2025-02-04 10:47:27.823451565 +0100
-+++ b/userguide/pampaintspill.html	2025-02-04 18:01:50.746117598 +0100
-@@ -7,7 +7,7 @@ Updated: 02 November 2021
- <a href="#index">Table Of Contents</a>
- 
- <h2>NAME</h2>
-pampaintspill - smoothly spill colors into the background
-+<p>pampaintspill - smoothly spill colors into the background</p>
- 
- <h2 id="synopsis">SYNOPSIS</h2>
- 
-@@ -19,48 +19,48 @@ pampaintspill - smoothly spill colors in
- [<b>--downsample</b>=<i>number</i>]
- [<b>--near</b>=<i>number</i>]
- [<b>--power</b>=<i>number</i>] [<i>filename</i>]
-[<b>-randomseed=</b><i>integer</i>]
-+[<b>-randomseed=</b><i>integer</i>]</p>
- 
- 
- <p>Minimum unique abbreviations of option are acceptable.  You may use
- double hyphens instead of single hyphen to denote options.  You may use
- white space in place of the equals sign to separate an option name
-from its value.
-+from its value.</p>
- 
- <h2 id="description">DESCRIPTION</h2>
- 
-<p>This program is part of <a href="index.html">Netpbm</a>.
-+<p>This program is part of <a href="index.html">Netpbm</a>.</p>
- 
- <p><b>pampaintspill</b> produces a smooth color gradient from all of the
- non-background-colored pixels in an input image, effectively "spilling
- paint" onto the background.  <b>pampaintspill</b> is similar to
-<b>pamgradient</b> but differs in the following characteristics:
-+<b>pamgradient</b> but differs in the following characteristics:</p>
- 
- <ul>
-   <li><b>pampaintspill</b> accepts any number of paint
-       sources (non-background-colored pixels), which can lie anywhere
-       on the canvas.  <b>pamgradient</b> accepts exactly
-      four paint sources, one in each corner of the image.
-+      four paint sources, one in each corner of the image.</li>
- 
-   <li><b>pampaintspill</b> requires an input image while
-       <b>pamgradient</b> generates a new image from
-      scratch.
-+      scratch.</li>
- 
-   <li><b>pampaintspill</b> can produce tileable output and
-       can control how tightly the gradient colors bind to their source
-      pixels.
-+      pixels.</li>
- </ul>
- 
- <p>Results are generally best when the input image contains just a few, crisp
- spots of color. Use your drawing program's pencil tool &mdash; as opposed to a
-paintbrush or airbrush tool &mdash; with a small nib.
-+paintbrush or airbrush tool &mdash; with a small nib.</p>
- 
- <h2 id="options">OPTIONS</h2>
- 
- <p>In addition to the options common to all programs based on libnetpbm
- (most notably <b>-quiet</b>, see <a href="index.html#commonoptions">
- Common Options</a>), <b>pampaintspill</b> recognizes the following
-command line options:
-+command line options:</p>
- 
- <dl>
-   <dt><b>--bgcolor</b>=<i>color</i></dt>
-@@ -117,45 +117,45 @@ command line options:
-       gradients away from them.</dd>
- 
-   <dt><b>-randomseed=</b><i>integer</i>
-  <dd>This is the seed for the random number generator that generates the
-  pixels.
-+  <dd>This is the seed fodr the random number generator that generates the
-+  pixels.</dd>
- 
-  <p>Use this to ensure you get the same image on separate invocations.
-+  <p>Use this to ensure you get the same image on separate invocations.</p>
- 
-  <p>This option was new in Netpbm 10.94 (March 2021).</dd>
-+  <p>This option was new in Netpbm 10.94 (March 2021).</p>
- </dl>
- 
- 
- <h2 id="seealso">SEE ALSO</h2>
- 
- <ul>
-<li><a href="pamgradient.html"><b>pamgradient</b></a>
-<li><a href="ppmmake.html"><b>ppmmake</b></a>,
-<li><a href="ppmrainbow.html"><b>ppmrainbow</b></a>,
-<li><a href="pgmramp.html"><b>pgmramp</b></a>,
-<li><a href="ppmpat.html"><b>ppmpat</b></a>,
-<li><a href="pam.html"><b>pam</b></a>
-+<li><a href="pamgradient.html"><b>pamgradient</b></a></li>
-+<li><a href="ppmmake.html"><b>ppmmake</b></a>,</li>
-+<li><a href="ppmrainbow.html"><b>ppmrainbow</b></a>,</li>
-+<li><a href="pgmramp.html"><b>pgmramp</b></a>,</li>
-+<li><a href="ppmpat.html"><b>ppmpat</b></a>,</li>
-+<li><a href="pam.html"><b>pam</b></a></li>
- </ul>
- 
- <h2 id="history">HISTORY</h2>
- 
-<p><b>pampaintspill</b> was new in Netpbm 10.50 (March 2010).
-+<p><b>pampaintspill</b> was new in Netpbm 10.50 (March 2010).</p>
- 
- 
- <h2 id="copyright">COPYRIGHT</h2>
- 
- <p>Copyright&nbsp;&copy; 2010&ndash;2021 Scott Pakin,
-<a href="mailto:scott+pbm@pakin.org"><i>scott+pbm@pakin.org</i></a>.
-+<a href="mailto:scott+pbm@pakin.org"><i>scott+pbm@pakin.org</i></a>.</p>
- 
- <h2 id="index">Table Of Contents</h2>
- 
- <ul>
-<li><a href="#synopsis">SYNOPSIS</a>
-<li><a href="#description">DESCRIPTION</a>
-<li><a href="#options">OPTIONS</a>
-<li><a href="#seealso">SEE ALSO</a>
-<li><a href="#history">HISTORY</a>
-<li><a href="#copyright">COPYRIGHT</a>
-+<li><a href="#synopsis">SYNOPSIS</a></li>
-+<li><a href="#description">DESCRIPTION</a></li>
-+<li><a href="#options">OPTIONS</a></li>
-+<li><a href="#seealso">SEE ALSO</a></li>
-+<li><a href="#history">HISTORY</a></li>
-+<li><a href="#copyright">COPYRIGHT</a></li>
- </ul>
- 
- </body>
-diff -urNp a/userguide/pamrecolor.html b/userguide/pamrecolor.html
--- a/userguide/pamrecolor.html	2025-02-04 10:47:27.823451565 +0100
-+++ b/userguide/pamrecolor.html	2025-02-04 18:10:00.968545076 +0100
-@@ -2,9 +2,9 @@
- <html><head><title>Pamrecolor User Manual</title></head>
 <body>
- <h1>pamrecolor</h1>
-Updated: 31 July 2010
-+<p>Updated: 31 July 2010
- <br>
-<a href="#index">Table Of Contents</a>
-+<a href="#index">Table Of Contents</a></p>
+@@ -11,6 +10,7 @@
 
- <h2>NAME</h2>
- pamrecolor - alter colors without affecting luminance
-@@ -22,15 +22,15 @@ pamrecolor - alter colors without affect
- [<b>-randomseed=</b><i>integer</i>]
+ <p><a href="#index">Table Of Contents</a></p>
 
- [<i>infile</i>]
-
-+</p>
+<H2>NAME</H2>
+ <p>pampaintspill - smoothly spill colors into the background</p>
 
- <p>Minimum unique abbreviation of option is acceptable.  You may use double
- hyphens instead of single hyphen to denote options.  You may use white
-space in place of the equals sign to separate an option name from its value.
-+space in place of the equals sign to separate an option name from its value.</p>
+ <h2><a name="synopsis">SYNOPSIS</a></h2>
+diff -urNp old/userguide/pamrecolor.html new/userguide/pamrecolor.html
+--- old/userguide/pamrecolor.html	2017-09-05 13:58:08.336559557 +0200
+++ new/userguide/pamrecolor.html	2017-09-05 14:04:34.714122098 +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>
 
- <h2 id="description">DESCRIPTION</h2>
+ <body>
+@@ -11,7 +10,7 @@
 
-<p>This program is part of <a href="index.html">Netpbm</a>.
-+<p>This program is part of <a href="index.html">Netpbm</a>.</p>
+ <p>Updated: 31 July 2010</p>
 
- <p><b>pamrecolor</b> changes an image's colors to be as close as
- possible to given target colors but with the constraint that the
-@@ -39,17 +39,17 @@ image will look identical if both are co
- (e.g. with
- <a href="ppmtopgm.html">ppmtopgm</a>).  You can have <b>pamrecolor</b> select
- target colors randomly, specify a single hue for the entire image, or take the
-target colors from a target image.
-+target colors from a target image.</p>
- 
- <p>In addition to real Netpbm images, <b>pamrecolor</b> works on pseudo-Netpbm
- images based on arbitrary color spaces.  You can define the color space
-explicitly or choose one of many that <b>pamrecolor</b> knows by name.
-+explicitly or choose one of many that <b>pamrecolor</b> knows by name.</p>
- 
- <p>The output is a PAM image on standard output.  Options control the
- exact format of the PAM.  If you want a PNM (PBM, PGM, or PPM) image,
- use <a href="pamtopnm.html">pamtopnm</a> on the output.  There is no
- need to convert if you will use the image as input to a current Netpbm
-program, but many other programs don't know what a PAM is.
-+program, but many other programs don't know what a PAM is.</p>
+-<p><a href="#contents">Table Of Contents</a></p>
+<p><a href="#index">Table Of Contents</a></p>
 
 
- <h2 id="options">OPTIONS</h2>
-@@ -57,7 +57,7 @@ program, but many other programs don't k
- <p>In addition to the options common to all programs based on libnetpbm
- (most notably <b>-quiet</b>, see <a href="index.html#commonoptions">
- Common Options</a>), <b>pamrecolor</b> recognizes the following
-command line options:
-+command line options:</p>
+ <h2 id="name">NAME</h2>
+diff -urNp old/userguide/pamsistoaglyph.html new/userguide/pamsistoaglyph.html
+--- old/userguide/pamsistoaglyph.html	2017-09-05 13:58:08.334559565 +0200
+++ new/userguide/pamsistoaglyph.html	2017-09-05 14:05:25.865944327 +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>
 
- <dl>
+ <body>
+diff -urNp old/userguide/pamstereogram.html new/userguide/pamstereogram.html
+--- old/userguide/pamstereogram.html	2017-09-05 13:58:08.337559553 +0200
+++ new/userguide/pamstereogram.html	2017-09-05 14:13:28.523959069 +0200
+@@ -1,5 +1,5 @@
+-<!DOCTYPE html>
+-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+ <head>
+ <title>Pamstereogram User Manual</title>
+ </head>
+@@ -10,7 +10,7 @@
 
-@@ -67,7 +67,7 @@ to luminance of each of the red, green,
- example, in the SMPTE-C color space an RGB color is converted to
- grayscale by multiplying the red channel by 0.2124132, the green
- channel by 0.7010437, and the blue channel by 0.0865432 and summing
-the resulting three products.
-+the resulting three products.</dd>
+ <p>Updated: 19 June 2015</p>
 
- <p>When you use this option, the input and output images are not true Netpbm
- images, because the Netpbm image format specifies a particular color space.
-@@ -76,9 +76,9 @@ the raster have different meaning.  Many
- images actually use a variation with a different color space.  For example,
- <a href="http://www.gimp.org/">GIMP</a> uses sRGB internally and if you
- have GIMP generate a Netpbm image file, it really generates a variation of
-the format that uses sRGB.
-+the format that uses sRGB.</p>
- 
-<p><b>pamrecolor</b> knows the following color spaces (<i>name</i> values):
-+<p><b>pamrecolor</b> knows the following color spaces (<i>name</i> values):</p>
- 
-   <dl>
-   <dt>adobe</dt>
-@@ -109,12 +109,12 @@ the format that uses sRGB.
- <p>The default is "ntsc" because this is the color space that the Netpbm
- formats and many graphics utilities use.  As a counterexample,
- <a href="http://www.gimp.org/">GIMP</a> uses sRGB as its native color
-space.
-+space.</p>
- 
- <p>The luminance values <b>pamrecolor</b> uses for each of the above come from
- Bruce Lindbloom's
- <a href="http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html">
-Computing RGB-to-XYZ and XYZ-to-RGB matrices</a> page.</dd>
-+Computing RGB-to-XYZ and XYZ-to-RGB matrices</a> page.</p>
- 
- <dt><b>--rmult</b>=<i>fraction</i></dt>
- <dt><b>--gmult</b>=<i>fraction</i></dt>
-@@ -133,15 +133,13 @@ image.  <b>pamrecolor</b> will make each
- to <i>color</i> subject to the constraint that the luminance must stay the
- same as in the original image.  Specify <i>color</i> as in
- the <a href="libnetpbm_image.html#colorname">argument of the <b>pnm_parsecolor()</b>
-library routine</a> (e.g.,&nbsp;"hotpink" or "#ff69b4").
-+library routine</a> (e.g.,&nbsp;"hotpink" or "#ff69b4").</dd>
- 
- <p>If you specify neither <b>--targetcolor</b> nor
- <b>--colorfile</b>, <b>pamrecolor</b> will randomly select a target color for
-each pixel of the input image.
-
-<p>You may not specify both <b>-targetcolor</b> and <b>-colorfile</b>.
-+each pixel of the input image.</p>
- 
-</dd>
-+<p>You may not specify both <b>-targetcolor</b> and <b>-colorfile</b>.</p>
- 
- <dt><b>--colorfile</b>=<i>file</i></dt>
- <dd>Take per-pixel target colors from Netpbm file <i>file</i> instead
-@@ -150,40 +148,38 @@ of using a single target color for the e
- If the image in the file wider or taller than the input image,
- <b>pamrecolor</b> uses only the left and top part of it.
- If the image is narrower or shorter, <b>pamrecolor</b> considers the
-image to be repeated in a tile pattern.
-+image to be repeated in a tile pattern.</dd>
- 
- <p>If you specify neither <b>--targetcolor</b> nor
- <b>--colorfile</b>, <b>pamrecolor</b> will randomly select a target color for
-each pixel of the input image.
-+each pixel of the input image.</p>
- 
-<p>You may not specify both <b>-targetcolor</b> and <b>-colorfile</b>.
-+<p>You may not specify both <b>-targetcolor</b> and <b>-colorfile</b>.</p>
- 
-<dt><b>-randomseed=</b><i>integer</i>
-+<dt><b>-randomseed=</b><i>integer</i></dt>
- 
- <dd>This is the seed for the random number generator that generates the
-pixels.
-+pixels.</dd>
- 
-<p>Use this to ensure you get the same image on separate invocations.
-+<p>Use this to ensure you get the same image on separate invocations.</p>
- 
- <p>By default, <b>pamrecolor</b> uses a seed derived from the time of day
- and process ID, which gives you fairly uncorrelated results in multiple
-invocations.
-
-<p>This option was new in Netpbm 10.61 (December 2012).
-+invocations.</p>
- 
-</dl>
-+<p>This option was new in Netpbm 10.61 (December 2012).</p>
+-<p><a href="#contents">Table Of Contents</a></p>
+<p><a href="#index">Table Of Contents</a></p>
 
 
- <h2 id="examples">EXAMPLES</h2>
+ <h2 id="name">NAME</h2>
+diff -urNp old/userguide/pamtoavs.html new/userguide/pamtoavs.html
+--- old/userguide/pamtoavs.html	2017-09-05 13:58:08.329559583 +0200
+++ new/userguide/pamtoavs.html	2017-09-05 14:05:49.299863901 +0200
+@@ -1,5 +1,5 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html>
+ <head>
+ <title>Pamtoavs User Manual</title>
+ <meta http-equiv="content-type" content="text/html; charset=us-ascii" />
+diff -urNp old/userguide/pamtooctaveimg.html new/userguide/pamtooctaveimg.html
+--- old/userguide/pamtooctaveimg.html	2017-09-05 13:58:08.335559561 +0200
+++ new/userguide/pamtooctaveimg.html	2017-09-05 14:06:21.825752356 +0200
+@@ -1,8 +1,7 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html>
+ <head>
+ <title>Pamtooctaveimg User Manual</title>
+-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ </head>
 
-<p>This command tints an image yellow:
-+<p>This command tints an image yellow:</p>
+ <body>
+diff -urNp old/userguide/pnmflip.html new/userguide/pnmflip.html
+--- old/userguide/pnmflip.html	2017-09-05 13:58:08.336559557 +0200
+++ new/userguide/pnmflip.html	2017-09-05 14:07:15.065963977 +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>.
 
- <pre>
-     pamrecolor --targetcolor=yellow colorpic.pam &gt; yellowpic.pam
- </pre>
+<H2>DESCRIPTION</H2>
+ <P><B>pamflip</b> is mostly backward compatible with <b>pnmflip</b>,
+ but works on PAM images too.
 
- <p>This command takes the colors from <b>colorpicture.ppm</b> and applies
-them to <b>graypicture.pgm</b>:
-+them to <b>graypicture.pgm</b>:</p>
- 
- <pre>
-     pamrecolor --colorfile=colorpic.ppm graypic.pgm &gt; colorizedpic.pam
-@@ -192,52 +188,52 @@ them to <b>graypicture.pgm</b>:
- <p>The grayscale version of <b>colorizedpic.pam</b> will look just like
- graypic.pgm.  Note that if you use a non-Netpbm tool to do the conversion to
- grayscale, you may additionally need to specify an
-appropriate <b>--colorspace</b> value for your conversion tool.
-+appropriate <b>--colorspace</b> value for your conversion tool.</p>
- 
- 
- <h2 id="notes">NOTES</h2>
- 
- <p>Here are a couple of fun special effects you can produce with
-<b>pamrecolor</b>:
-+<b>pamrecolor</b>:</p>
- 
- <ul>
- <li>Specify a color file that is identical to the input image but with
- some large, colored text added to it.  The text will "magically"
-vanish when the image is converted to grayscale.
-+vanish when the image is converted to grayscale.</li>
- 
- <li>Provide a low-contrast grayscale image &mdash; perhaps a secret
- message written in similar shades of gray &mdash; as the input file and
- a colorful but completely different image as the color file.  If done
- carefully, the grayscale image can be hidden by the colorful image.
- Only people who know to convert the result to grayscale can recover
-the original grayscale image.
-+the original grayscale image.</li>
- 
- <li>Use <b>--targetcolor</b>=tan to make an image look like an
- old-timey photograph (or, more precisely, a
- <a href="http://en.wikipedia.org/wiki/Photographic_print_toning">sepia-toned
-photograph</a> of the late 1800s).
-+photograph</a> of the late 1800s).</li>
- </ul>
- 
- 
- <h2 id="history">HISTORY</h2>
- 
-<p>Scott Pakin wrote <b>pamrecolor</b> in July 2010.
-+<p>Scott Pakin wrote <b>pamrecolor</b> in July 2010.</p>
- 
-<p><b>pamrecolor</b> was new in Netpbm 10.52 (September 2010).
-+<p><b>pamrecolor</b> was new in Netpbm 10.52 (September 2010).</p>
- 
- 
- <h2 id="author">AUTHOR</h2>
- 
- <p>Copyright (C) 2010 Scott
-Pakin, <a href="mailto:scott+pbm@pakin.org">scott+pbm@pakin.org</a>
-+Pakin, <a href="mailto:scott+pbm@pakin.org">scott+pbm@pakin.org</a></p>
- 
- 
- <h2 id="seealso">SEE ALSO</h2>
- 
- <ul>
-<li><a href="ppmtopgm.html"><b>ppmtopgm</b></a>
-<li><a href="ppmchange.html"><b>ppmchange</b></a>
-<li><a href="pnmremap.html"><b>pnmremap</b></a>
-+<li><a href="ppmtopgm.html"><b>ppmtopgm</b></a></li>
-+<li><a href="ppmchange.html"><b>ppmchange</b></a></li>
-+<li><a href="pnmremap.html"><b>pnmremap</b></a></li>
- </ul>
- 
- 
-@@ -246,14 +242,14 @@ Pakin, <a href="mailto:scott+pbm@pakin.o
- <h2 id="index">Table Of Contents</h2>
- 
- <ul>
-<li><a href="#synopsis">SYNOPSIS</a>
-<li><a href="#description">DESCRIPTION</a>
-<li><a href="#options">OPTIONS</a>
-<li><a href="#examples">EXAMPLES</a>
-<li><a href="#notes">NOTES</a>
-<li><a href="#history">HISTORY</a>
-<li><a href="#author">AUTHOR</a>
-<li><a href="#seealso">SEE ALSO</a>
-+<li><a href="#synopsis">SYNOPSIS</a></li>
-+<li><a href="#description">DESCRIPTION</a></li>
-+<li><a href="#options">OPTIONS</a></li>
-+<li><a href="#examples">EXAMPLES</a></li>
-+<li><a href="#notes">NOTES</a></li>
-+<li><a href="#history">HISTORY</a></li>
-+<li><a href="#author">AUTHOR</a></li>
-+<li><a href="#seealso">SEE ALSO</a></li>
- </ul>
- 
- </body>
-diff -urNp a/userguide/pbmtog3.html b/userguide/pbmtog3.html
--- a/userguide/pbmtog3.html	2025-02-04 10:47:27.827451549 +0100
-+++ b/userguide/pbmtog3.html	2025-02-04 18:10:55.328259786 +0100
-@@ -80,7 +80,7 @@ You cannot specify both.
- <h2 id="history">HISTORY</h2>
- 
- <p>Before Netpbm 10.79 (June 2017), there was a different program by the same
-name in Netpbm, which was written by by Paul Haeberli
-+name in Netpbm, which was written by Paul Haeberli
- &lt;<a href="mailto:paul@manray.sgi.com">paul@manray.sgi.com</a>&gt; in 1989
- and then modified extensively by others.
- 
-diff -urNp a/userguide/ppmtogif.html b/userguide/ppmtogif.html
--- a/userguide/ppmtogif.html	2025-02-04 10:47:27.828451545 +0100
-+++ b/userguide/ppmtogif.html	2025-02-04 18:12:39.950710820 +0100
-@@ -5,17 +5,17 @@
- 
- <h2>NAME</h2>
- 
-ppmtogif - replaced by pamtogif
-
-<h2>DESCRIPTION</h2>
-+<p>ppmtogif - replaced by pamtogif</p>
- 
- <p>This program is part of <a href="index.html">Netpbm</a>.
- 
-+<h2>SYNOPSIS</h2>
+diff -urNp old/userguide/pnmmercator.html new/userguide/pnmmercator.html
+--- old/userguide/pnmmercator.html	2017-09-05 13:58:08.334559565 +0200
+++ new/userguide/pnmmercator.html	2017-09-05 14:08:08.305214742 +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 -urNp old/userguide/ppmtogif.html new/userguide/ppmtogif.html
+--- old/userguide/ppmtogif.html	2017-09-05 13:58:08.337559553 +0200
+++ new/userguide/ppmtogif.html	2017-09-05 14:09:51.450583126 +0200
+@@ -4,11 +4,14 @@
+ <BODY>
+ <H1>ppmtogif</H1>
+ <BR>
+<H2>NAME</H2>
 <p><b>ppmtogif</b> was replaced in Netpbm 10.37 (December 2006) by
 <b><a href="pamtogif.html">pamtogif</a></b>.
 
- <p><b>pamtogif</b> is mostly backward compatible with <b>ppmtogif</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>
+<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-manual-pages.patch
+++ b/netpbm-manual-pages.patch
--- a/netpbm-pamtojpeg2k.patch
+++ b/netpbm-pamtojpeg2k.patch
@ -1,7 +1,234 @@
-diff -up netpbm-10.47.12/converter/other/jpeg2000/pamtojpeg2k.c.pamtojpeg2kfix netpbm-10.47.12/converter/other/jpeg2000/pamtojpeg2k.c
--- netpbm-10.47.12/converter/other/jpeg2000/pamtojpeg2k.c.pamtojpeg2kfix	2010-04-27 15:47:10.000000000 +0200
-+++ netpbm-10.47.12/converter/other/jpeg2000/pamtojpeg2k.c	2010-05-03 15:37:49.934269588 +0200
-@@ -532,7 +532,5 @@ main(int argc, char **argv)
+diff --git a/converter/other/jpeg2000/pamtojpeg2k.c b/converter/other/jpeg2000/pamtojpeg2k.c
+index 4d73316..a53573f 100644
+--- a/converter/other/jpeg2000/pamtojpeg2k.c
+++ b/converter/other/jpeg2000/pamtojpeg2k.c
+@@ -98,7 +98,7 @@ parseCommandLine(int argc, char ** argv,
+     char * modeOpt;
+ 
+     unsigned int option_def_index;
+-
+    
+     MALLOCARRAY_NOFAIL(option_def, 100);
+ 
+     option_def_index = 0;   /* incremented by OPTENTRY */
+@@ -134,25 +134,25 @@ parseCommandLine(int argc, char ** argv,
+             &numrlvlsSpec,       0);
+     OPTENT3(0, "numgbits",     OPT_UINT,   &cmdlineP->numgbits,
+             &numgbitsSpec,       0);
+-    OPTENT3(0, "nomct",        OPT_FLAG,   NULL,
+    OPTENT3(0, "nomct",        OPT_FLAG,   NULL, 
+             &cmdlineP->nomct,    0);
+-    OPTENT3(0, "sop",          OPT_FLAG,   NULL,
+    OPTENT3(0, "sop",          OPT_FLAG,   NULL, 
+             &cmdlineP->sop,      0);
+-    OPTENT3(0, "eph",          OPT_FLAG,   NULL,
+    OPTENT3(0, "eph",          OPT_FLAG,   NULL, 
+             &cmdlineP->eph,      0);
+-    OPTENT3(0, "lazy",         OPT_FLAG,   NULL,
+    OPTENT3(0, "lazy",         OPT_FLAG,   NULL, 
+             &cmdlineP->lazy,     0);
+-    OPTENT3(0, "termall",      OPT_FLAG,   NULL,
+    OPTENT3(0, "termall",      OPT_FLAG,   NULL, 
+             &cmdlineP->termall,  0);
+-    OPTENT3(0, "segsym",       OPT_FLAG,   NULL,
+    OPTENT3(0, "segsym",       OPT_FLAG,   NULL, 
+             &cmdlineP->segsym,    0);
+-    OPTENT3(0, "vcausal",      OPT_FLAG,   NULL,
+    OPTENT3(0, "vcausal",      OPT_FLAG,   NULL, 
+             &cmdlineP->vcausal,   0);
+-    OPTENT3(0, "pterm",        OPT_FLAG,   NULL,
+    OPTENT3(0, "pterm",        OPT_FLAG,   NULL, 
+             &cmdlineP->pterm,     0);
+-    OPTENT3(0, "resetprob",    OPT_FLAG,   NULL,
+    OPTENT3(0, "resetprob",    OPT_FLAG,   NULL, 
+             &cmdlineP->resetprob, 0);
+-    OPTENT3(0, "verbose",      OPT_FLAG,   NULL,
+    OPTENT3(0, "verbose",      OPT_FLAG,   NULL, 
+             &cmdlineP->verbose,   0);
+     OPTENT3(0, "debuglevel",   OPT_UINT,   &cmdlineP->debuglevel,
+             &debuglevelSpec,      0);
+@@ -223,7 +223,7 @@ parseCommandLine(int argc, char ** argv,
+         cmdlineP->inputFilename = strdup("-");  /* he wants stdin */
+     else if (argc - 1 == 1)
+         cmdlineP->inputFilename = strdup(argv[1]);
+-    else
+    else 
+         pm_error("Too many arguments.  The only argument accepted\n"
+                  "is the input file specification");
+ 
+@@ -232,7 +232,7 @@ parseCommandLine(int argc, char ** argv,
+ 
+ 
+ static void
+-createJasperRaster(struct pam *  const inpamP,
+createJasperRaster(struct pam *  const inpamP, 
+                    jas_image_t * const jasperP) {
+ /*----------------------------------------------------------------------------
+    Create the raster in the *jasperP object, reading the raster from the
+@@ -254,7 +254,7 @@ createJasperRaster(struct pam *  const inpamP,
+         if (matrix[plane] == NULL)
+             pm_error("Unable to create matrix for plane %u.  "
+                      "jas_matrix_create() failed.", plane);
+-    }
+    }   
+     tuplerow = pnm_allocpamrow(inpamP);
+ 
+     jasperMaxval = pm_bitstomaxval(pm_maxvaltobits(inpamP->maxval));
+@@ -271,7 +271,7 @@ createJasperRaster(struct pam *  const inpamP,
+                 unsigned int jasperSample;
+ 
+                 if (oddMaxval)
+-                    jasperSample = tuplerow[col][plane] *
+                    jasperSample = tuplerow[col][plane] * 
+                         jasperMaxval / inpamP->maxval;
+                 else
+                     jasperSample = tuplerow[col][plane];
+@@ -279,16 +279,16 @@ createJasperRaster(struct pam *  const inpamP,
+                 jas_matrix_set(matrix[plane], 0, col, jasperSample);
+             }
+         }
+-        {
+        { 
+             unsigned int plane;
+ 
+             for (plane = 0; plane < inpamP->depth; ++plane) {
+                 int rc;
+-                rc = jas_image_writecmpt(jasperP, plane, 0, row,
+                rc = jas_image_writecmpt(jasperP, plane, 0, row, 
+                                          inpamP->width, 1,
+                                          matrix[plane]);
+                 if (rc != 0)
+-                    pm_error("jas_image_writecmpt() of plane %u failed.",
+                    pm_error("jas_image_writecmpt() of plane %u failed.", 
+                              plane);
+             }
+         }
+@@ -297,14 +297,14 @@ createJasperRaster(struct pam *  const inpamP,
+     pnm_freepamrow(tuplerow);
+     for (plane = 0; plane < inpamP->depth; ++plane)
+         jas_matrix_destroy(matrix[plane]);
+-
+    
+     free(matrix);
+ }
+ 
+ 
+ 
+ static void
+-createJasperImage(struct pam *   const inpamP,
+createJasperImage(struct pam *   const inpamP, 
+                   jas_image_t ** const jasperPP) {
+ 
+ 	jas_image_cmptparm_t * cmptparms;
+@@ -322,7 +322,7 @@ createJasperImage(struct pam *   const inpamP,
+         cmptparms[plane].prec = pm_maxvaltobits(inpamP->maxval);
+         cmptparms[plane].sgnd = 0;
+     }
+-    *jasperPP =
+    *jasperPP = 
+         jas_image_create(inpamP->depth, cmptparms, JAS_CLRSPC_UNKNOWN);
+     if (*jasperPP == NULL)
+         pm_error("Unable to create jasper image structure.  "
+@@ -371,7 +371,7 @@ convertToJasperImage(struct pam *   const inpamP,
+ 
+ 
+ static void
+-writeJpc(jas_image_t *      const jasperP,
+writeJpc(jas_image_t *      const jasperP, 
+          struct cmdlineInfo const cmdline,
+          FILE *             const ofP) {
+ 
+@@ -383,8 +383,8 @@ writeJpc(jas_image_t *      const jasperP,
+ 
+     /* Note: ilyrrates is a hack because we're too lazy to properly parse
+        command line options to get the information and then compose
+-       a proper input to Jasper.  So the user can screw things up by
+-       specifying garbage for the -ilyrrates option
+       a proper input to Jasper.  So the user can screw things up by 
+       specifying garbage for the -ilyrrates option 
+     */
+     if (strlen(cmdline.ilyrrates) > 0)
+         pm_asprintf(&ilyrratesOpt, "ilyrrates=%s", cmdline.ilyrrates);
+@@ -410,7 +410,7 @@ writeJpc(jas_image_t *      const jasperP,
+         */
+         rateOpt[0] = '\0';
+     }
+-    pm_asprintf(&options,
+    pm_asprintf(&options, 
+                 "imgareatlx=%u "
+                 "imgareatly=%u "
+                 "tilegrdtlx=%u "
+@@ -428,7 +428,7 @@ writeJpc(jas_image_t *      const jasperP,
+                 "numrlvls=%u "
+                 "numgbits=%u "
+                 "%s %s %s %s %s %s %s %s %s",
+-
+                
+                 cmdline.imgareatlx,
+                 cmdline.imgareatly,
+                 cmdline.tilegrdtlx,
+@@ -471,8 +471,8 @@ writeJpc(jas_image_t *      const jasperP,
+             pm_message("Using Jasper to encode to 'jpc' format with options "
+                        "'%s'", options);
+ 
+-        rc = jas_image_encode(jasperP, outStreamP,
+-                              jas_image_strtofmt((char*)"jpc"),
+        rc = jas_image_encode(jasperP, outStreamP, 
+                              jas_image_strtofmt((char*)"jpc"), 
+                               (char *)options);
+         if (rc != 0)
+             pm_error("jas_image_encode() failed to encode the JPEG 2000 "
+@@ -484,11 +484,11 @@ writeJpc(jas_image_t *      const jasperP,
+         int rc;
+ 
+         rc = jas_stream_close(outStreamP);
+-
+            
+         if (rc != 0)
+             pm_error("Failed to close output stream, "
+                      "jas_stream_close() rc = %d", rc);
+-    }
+    }                     
+ 
+ 	jas_image_clearfmts();
+ 
+@@ -506,33 +506,31 @@ main(int argc, char **argv)
+     jas_image_t * jasperP;
+ 
+     pnm_init(&argc, argv);
+-
+    
+     parseCommandLine(argc, argv, &cmdline);
+-
+-    {
+    
+    { 
+         int rc;
+-
+        
+         rc = jas_init();
+         if ( rc != 0 )
+             pm_error("Failed to initialize Jasper library.  "
+                      "jas_init() returns rc %d", rc );
+     }
+-
+    
+     jas_setdbglevel(cmdline.debuglevel);
+-
+    
+     ifP = pm_openr(cmdline.inputFilename);
+-
+    
+     pnm_readpaminit(ifP, &inpam, PAM_STRUCT_SIZE(tuple_type));
+-
+    
+     convertToJasperImage(&inpam, &jasperP);
+-
+    
+     writeJpc(jasperP, cmdline, stdout);
+-
+    
+ 	jas_image_destroy(jasperP);
 
     pm_close(ifP);
 
--- a/netpbm-ppmfadeusage.patch
+++ b/netpbm-ppmfadeusage.patch
@ -1,62 +1,57 @@
-diff -urNp a/editor/ppmfade b/editor/ppmfade
--- a/editor/ppmfade	2025-02-04 10:47:27.812451607 +0100
-+++ b/editor/ppmfade	2025-02-04 10:52:14.233336029 +0100
-@@ -99,6 +99,9 @@ sub commandLineArgs() {
-             $mode = 'BLOCK';
-         } elsif ($arg eq "-mix") {
-             $mode = 'MIX';
-+        } elsif ($arg eq "-help" || $arg eq "--help" || $arg eq "-h") {
-+            print STDERR ("ppmfade: Use 'man ppmfade' for help.\n");
-+            exit 1;
+diff -urNp old/editor/ppmfade new/editor/ppmfade
+--- old/editor/ppmfade	2017-11-01 11:47:49.869611402 +0100
+++ new/editor/ppmfade	2017-11-01 11:53:25.524973342 +0100
+@@ -84,7 +84,7 @@ for ($n = 0; $n < @ARGV; $n++) {
+         if (-e $first_file) {
         } else {
-             if (substr($arg, 0, 1) eq '-') {
-                    print STDERR ("Unknown option '$arg'.  " .
-@@ -109,13 +112,13 @@ sub commandLineArgs() {
-                 print STDERR ("There are no non-option arguments possible.  " .
-                               "You specified '$arg'\n");
-             }
-            exit 100;
+             print "I can't find first file '$first_file'\n";
+-            exit 20;
 +            exit 1;
         }
-     }
- 
-     if (!defined($firstFileNm) && !defined($lastFileNm)) {
-         print STDERR ("You must specify -f or -l (or both)\n");
-        exit 90;
-+        exit 1
-     }
- 
-     if (!defined($mode)) {
-@@ -142,7 +145,7 @@ sub imageDimensions($$) {
+     } elsif ($ARGV[$n] eq "-l") {
+         $n++;
+@@ -92,7 +92,7 @@ for ($n = 0; $n < @ARGV; $n++) {
+         if (-e $last_file) {
         } else {
-             print STDERR
-                 ("Unrecognized results from pnmfile on $firstFileNm.\n");
-            exit(50);
-+            exit(1);
+             print "I can't find last file '$last_file'\n";
+-            exit 20;
+            exit 1;
         }
+     } elsif ($ARGV[$n] eq "-base") {
+         $n++;
+@@ -113,9 +113,12 @@ for ($n = 0; $n < @ARGV; $n++) {
+         $mode = $BLOCK;
+     } elsif ("$ARGV[$n]" eq "-mix") {
+         $mode = $MIX;
+    } elsif ($ARGV[$n] eq "-help" || $ARGV[$n] eq "--help" || $ARGV[$n] eq "-h") {
+        print "ppmfade: Use 'man ppmfade' for help.\n";
+        exit 1;
     } else {
-         # $lastFileNm is defined
-@@ -151,7 +154,7 @@ sub imageDimensions($$) {
-         } else {
-             print STDERR
-                 ("Unrecognized results from pnmfile on $firstFileNm.\n");
-            exit(50);
-+            exit(1);
-         }
+         print "Unknown argument: $ARGV[$n]\n";
+-        exit 100;
+        exit 1;
+     } 
+ }
+ #
+@@ -134,18 +137,18 @@ if ($first_file ne "undefined") {
+         $width = $1; $height = $2;
+     } else {
+         print("Unrecognized results from pnmfile on $first_file.\n");
+-        exit(50);
+        exit 1;
     }
-     return $width, $height;
-@@ -436,12 +439,12 @@ my ($mode, $firstFileNm, $lastFileNm, $b
- 
- if (defined($firstFileNm) && !-e($firstFileNm)) {
-     print STDERR ("First file '$firstFileNm' does not exist\n");
-    exit 20;
+ } elsif ($last_file ne "undefined") {
+     if ((`pnmfile $last_file` =~ m{\b(\d+)\sby\s(\d+)} )) { 
+         $width = $1; $height = $2;
+     } else {
+         print("Unrecognized results from pnmfile on $first_file.\n");
+-        exit(50);
+        exit 1;
+     }
+ } else {
+     print("ppmfade:  You must specify -f or -l (or both)\n");
+-    exit(90);
 +    exit 1;
 }
 
- if (defined($lastFileNm) && !-e($lastFileNm)) {
-     print STDERR ("Last file '$lastFileNm' does not exist\n");
-    exit 20;
-+    exit 1;
- }
- 
- my ($width, $height) = imageDimensions($firstFileNm, $lastFileNm);
+ print("Frames are " . $width . "W x " . $height . "H\n");
--- a/netpbm-python3.patch
+++ b/netpbm-python3.patch
@ -1,28 +1,9 @@
-diff --git a/buildtools/makeman b/buildtools/makeman
-index 196dbd0..d73ab76 100755
--- a/buildtools/makeman
-+++ b/buildtools/makeman
+diff -urNp old/buildtools/makeman new/buildtools/makeman
+--- old/buildtools/makeman	2018-01-03 12:15:55.000000000 +0100
+++ new/buildtools/makeman	2018-02-26 14:18:39.993760106 +0100
@@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
 #
 # makeman -- compile netpbm's stereotyped HTML to troff markup
 #
-diff --git a/buildtools/manpage.mk b/buildtools/manpage.mk
-index ef1a103..c1badb8 100644
--- a/buildtools/manpage.mk
-+++ b/buildtools/manpage.mk
-@@ -126,11 +126,11 @@ reportman:
- # to standard error.
- %.1 %.3 %.5: $(USERGUIDE)/%.html
- 	@echo Converting $< to $@
-	@python $(MAKEMAN) -d $(USERGUIDE) $(<F) 
-+	@python3 $(MAKEMAN) -d $(USERGUIDE) $(<F)
- 
- netpbm.1: $(USERGUIDE)/index.html
- 	@echo Converting $< to $@
-	@python $(MAKEMAN) -d $(USERGUIDE) index.html
-+	@python3 $(MAKEMAN) -d $(USERGUIDE) index.html
- 	@mv index.1 netpbm.1
- 
- # Generate man pages
--- a/netpbm-security-code.patch
+++ b/netpbm-security-code.patch
--- a/netpbm-security-scripts.patch
+++ b/netpbm-security-scripts.patch
@ -0,0 +1,267 @@
+diff --git a/editor/ppmfade b/editor/ppmfade
+index dcd7bf2..5091651 100755
+--- a/editor/ppmfade
+++ b/editor/ppmfade
+@@ -40,6 +40,7 @@ exec perl -w -x -S -- "$0" "$@"
+ #
+ ##############################################################################
+ use strict;
+use File::Temp "tempdir";
+ 
+ sub doVersionHack($) {
+     my ($argvR) = @_;
+@@ -149,20 +150,26 @@ if ($first_file ne "undefined") {
+ 
+ print("Frames are " . $width . "W x " . $height . "H\n");
+ 
+#
+# We create a tmp-directory right here
+#
+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
+
+
+ if ($first_file eq "undefined") {
+     print "Fading from black to ";
+-    system("ppmmake \\#000 $width $height >junk1$$.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
+ } else {
+     print "Fading from $first_file to ";
+-    system("cp", $first_file, "junk1$$.ppm");
+    system("cp", $first_file, "$tmpdir/junk1$$.ppm");
+ }
+ 
+ if ($last_file eq "undefined") {
+     print "black.\n";
+-    system("ppmmake \\#000 $width $height >junk2$$.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
+ } else {
+     print "$last_file\n";
+-    system("cp", $last_file, "junk2$$.ppm");
+    system("cp", $last_file, "$tmpdir/junk2$$.ppm");
+ }
+ 
+ #
+@@ -170,14 +177,14 @@ if ($last_file eq "undefined") {
+ #
+ 
+ # Here's what our temporary files are:
+-#   junk1$$.ppm: The original (fade-from) image
+-#   junk2$$.ppm: The target (fade-from) image
+-#   junk3$$.ppm: The frame of the fade for the current iteration of the 
+-#                the for loop.
+-#   junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
+-#                 image to another, this is the first frame of that 
+-#                 sequence.
+-#   junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
+#   $tmpdir/junk1$$.ppm: The original (fade-from) image
+#   $tmpdir/junk2$$.ppm: The target (fade-from) image
+#   $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the 
+#                	 the for loop.
+#   $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
+#                         image to another, this is the first frame of that 
+#                         sequence.
+#   $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
+ 
+ my $i;    # Frame number
+ for ($i = 1; $i <= $nframes; $i++) {
+@@ -185,147 +192,147 @@ for ($i = 1; $i <= $nframes; $i++) {
+     if ($mode eq $SPREAD) {
+         if ($i <= 10) {
+             my $n = $spline20[$i] * 100;
+-            system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
+         } elsif ($i <= 20) {
+             my $n;
+             $n = $spline20[$i] * 100;
+-            system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
+             $n = (1-$spline20[$i-10]) * 100;
+-            system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
+             $n = $spline10[$i-10];
+-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
+         } else {
+             my $n = (1-$spline20[$i-10])*100;
+-            system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
+         }
+     } elsif ($mode eq $SHIFT) {
+         if ($i <= 10) {
+             my $n = $spline20[$i] * 100;
+-            system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
+         } elsif ($i <= 20) {
+             my $n;
+             $n = $spline20[$i] * 100;
+-            system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
+             $n = (1-$spline20[$i-10])*100;
+-            system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
+             $n = $spline10[$i-10];
+-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
+         } else {
+             my $n = (1-$spline20[$i-10]) * 100;
+-            system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
+         }
+     } elsif ($mode eq $RELIEF) {
+         if ($i == 1) {
+-            system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
+            system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
+         }
+         if ($i <= 10) {
+             my $n = $spline10[$i];
+-            system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
+         } elsif ($i <= 20) {
+             my $n = $spline10[$i-10];
+-            system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
+         } else {
+             my $n = $spline10[$i-20];
+-            system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
+         }
+         if ($i == 10) {
+-            system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
+            system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
+         }
+     } elsif ($mode eq $OIL) {
+         if ($i == 1) {
+-            system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
+-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
+-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
+         }
+         if ($i <= 10) {
+             my $n = $spline10[$i];
+-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
+         } elsif ($i <= 20) {
+             my $n = $spline10[$i-10];
+-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
+         } else {
+             my $n = $spline10[$i-20];
+-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
+         }
+         if ($i == 10) {
+-            system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
+-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
+-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
+         }
+     } elsif ($mode eq $EDGE) {
+         if ($i == 1) {
+-            system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
+-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
+-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
+         }
+         if ($i <= 10) {
+             my $n = $spline10[$i];
+-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
+         } elsif ($i <= 20) {
+             my $n = $spline10[$i-10];
+-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
+         } else {
+             my $n = $spline10[$i-20];
+-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
+         }
+         if ($i == 10) {
+-            system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
+-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
+-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
+         } 
+     } elsif ($mode eq $BENTLEY) {
+         if ($i == 1) {
+-            system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
+-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
+-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
+         }
+         if ($i <= 10) {
+             my $n = $spline10[$i];
+-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
+         } elsif ($i <= 20) {
+             my $n = $spline10[$i-10];
+-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
+         } else {
+             my $n = $spline10[$i-20];
+-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
+         }
+         if ($i == 10) {
+-            system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
+-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
+-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
+         }
+     } elsif ($mode eq $BLOCK) {
+         if ($i <= 10) {
+             my $n = 1 - 1.9*$spline20[$i];
+-            system("pamscale $n junk1$$.ppm | " .
+-                   "pamscale -width $width -height $height >junk3$$.ppm");
+            system("pamscale $n $tmpdir/junk1$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
+         } elsif ($i <= 20) {
+             my $n = $spline10[$i-10];
+-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
+         } else {
+             my $n = 1 - 1.9*$spline20[31-$i];
+-            system("pamscale $n junk2$$.ppm | " .
+-                   "pamscale -width $width -height $height >junk3$$.ppm");
+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
+         }
+         if ($i == 10) {
+-            system("cp", "junk3$$.ppm", "junk1a$$.ppm");
+-            system("pamscale $n junk2$$.ppm | " .
+-                   "pamscale -width $width -height $height >junk2a$$.ppm");
+            system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
+         }    
+     } elsif ($mode eq $MIX) {
+         my $fade_factor = sqrt(1/($nframes-$i+1));
+-        system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
+        system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
+     } else {
+         print("Internal error: impossible mode value '$mode'\n");
+     }
+ 
+     my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
+-    system("cp", "junk3$$.ppm", $outfile);
+    system("cp", "$tmpdir/junk3$$.ppm", $outfile);
+ }
+ 
+ #
+ #  Clean up shop.
+ #
+-system("rm junk*$$.ppm");
+system("rm $tmpdir/junk*$$.ppm");
+ 
+ exit(0);
--- a/netpbm-shlib-ldflags.patch
+++ b/netpbm-shlib-ldflags.patch
@ -1,13 +0,0 @@
-diff --git a/config.mk.in b/config.mk.in
-index 50687ba..d35c982 100644
--- a/config.mk.in
-+++ b/config.mk.in
-@@ -250,7 +250,7 @@ EXE =
- 
- # Here, $(SONAME) resolves to the soname for the shared library being created.
- # The following are gcc options.  This works on GNU libc systems.
-LDSHLIB = -shared -Wl,-soname,$(SONAME)
-+LDSHLIB = $(LDFLAGS) -shared -Wl,-soname,$(SONAME)
- # You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
- # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
- # documentation and doesn't exist in at least one non-BeOS installation.
--- a/netpbm-userguide.patch
+++ b/netpbm-userguide.patch
@ -0,0 +1,9 @@
+diff --git a/userguide/pammixmulti.html b/userguide/pammixmulti.html
+index c5854c3..a18fa14 100755
+--- a/userguide/pammixmulti.html
+++ b/userguide/pammixmulti.html
+@@ -1,4 +1,3 @@
+-<?xml version="1.0"?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN">
+ <html>
+ <head>
--- a/netpbm.spec
+++ b/netpbm.spec
@ -1,9 +1,9 @@
 Summary:         A library for handling different graphics file formats
 Name:            netpbm
-Version:         11.13.00
+Version:         10.87.00
 Release:         1%{?dist}
 # See copyright_summary for details
-License:         BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-or-later AND GPL-3.0-or-later AND IJG AND MIT AND NTP AND PostgreSQL AND LicenseRef-MIT-CRL-Xim AND LicenseRef-Fedora-Public-Domain
+License:         BSD and GPLv2 and IJG and MIT and Public Domain
 URL: http://netpbm.sourceforge.net/
 # Source0 is prepared by
 # svn checkout https://svn.code.sf.net/p/netpbm/code/advanced netpbm-%%{version}
@ -11,6 +11,7 @@ URL: http://netpbm.sourceforge.net/
 # svn checkout https://svn.code.sf.net/p/netpbm/code/trunk/test netpbm-%%{version}/test
 # and removing the .svn directories ( find -name "\.svn" -type d -print0 | xargs -0 rm -rf )
 Source0:         netpbm-%{version}.tar.xz
+Patch0:          netpbm-security-scripts.patch
 Patch1:          netpbm-security-code.patch
 Patch2:          netpbm-ppmfadeusage.patch
 Patch3:          netpbm-CVE-2017-2587.patch
@ -23,18 +24,17 @@ Patch9:          netpbm-xwdfix.patch
 Patch10:         netpbm-multilib.patch
 Patch11:         netpbm-glibc.patch
 Patch12:         netpbm-docfix.patch
-Patch13:         netpbm-pamtojpeg2k.patch
-Patch14:         netpbm-manfix.patch
-Patch15:         netpbm-jasper.patch
-Patch16:         netpbm-libdir-so.patch
-Patch17:         netpbm-c99.patch
-Patch18:         netpbm-shlib-ldflags.patch
+Patch13:         netpbm-fiasco-overflow.patch
+Patch14:         netpbm-cmuwtopbm.patch
+Patch15:         netpbm-pamtojpeg2k.patch
+Patch16:         netpbm-manfix.patch
+Patch17:         netpbm-manual-pages.patch
+Patch18:         netpbm-jasper.patch
+Patch19:	 netpbm-userguide.patch
+Patch20:	 netpbm-libdir-so.patch

-BuildRequires:   make
 BuildRequires:   libjpeg-devel, libpng-devel, libtiff-devel, flex, gcc, jbigkit-devel
 BuildRequires:   libX11-devel, perl-generators, python3, jasper-devel, libxml2-devel
-BuildRequires:   perl(Config), perl(Cwd), perl(English), perl(Fcntl), perl(File::Basename)
-BuildRequires:   perl(strict)
 %if (0%{?fedora} && 0%{?fedora} < 28) || (0%{?rhel} || 0%{?rhel} <= 7)
 BuildRequires:   ghostscript-core
 %else
@ -92,7 +92,6 @@ rm -rf converter/other/jpeg2000/libjasper/
 rm -rf converter/other/jbig/libjbig/

 %build
-%set_build_flags
 ./configure <<EOF


@ -119,19 +118,19 @@ TOP=`pwd`

 make \
 	CC="%{__cc}" \
-	LDFLAGS="$LDFLAGS -L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
-	CFLAGS="$CFLAGS -fPIC -flax-vector-conversions -fno-strict-aliasing" \
-	CFLAGS_CONFIG="$CFLAGS" \
+	LDFLAGS="$RPM_LD_FLAGS -L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
+	CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions -fno-strict-aliasing" \
+	CFLAGS_CONFIG="$RPM_OPT_FLAGS" \
 	LADD="-lm" \
-	JPEGINC_DIR=%{_usr}/include \
-	PNGINC_DIR=%{_usr}/include \
-	TIFFINC_DIR=%{_usr}/include \
-	JPEGLIB_DIR=%{_usr}/%{_lib} \
-	JBIGLIB=%{_usr}/%{_lib}/libjbig.so.2.1 \
-	PNGLIB_DIR=%{_usr}/%{_lib} \
-	TIFFLIB_DIR=%{_usr}/%{_lib} \
+	JPEGINC_DIR=%{_includedir} \
+	PNGINC_DIR=%{_includedir} \
+	TIFFINC_DIR=%{_includedir} \
+	JPEGLIB_DIR=%{_libdir} \
+	JBIGLIB=%{_libdir}/libjbig.so.2.1 \
+	PNGLIB_DIR=%{_libdir} \
+	TIFFLIB_DIR=%{_libdir} \
 	LINUXSVGALIB="NONE" \
-	X11LIB=%{_usr}/%{_lib}/libX11.so \
+	X11LIB=%{_libdir}/libX11.so \
 	XML2LIBS="NONE"

 # prepare man files
@ -149,12 +148,12 @@ done


 %install
-make package pkgdir=%{buildroot}%{_prefix} LINUXSVGALIB="NONE" XML2LIBS="NONE"
+make package pkgdir=%{buildroot}/usr LINUXSVGALIB="NONE" XML2LIBS="NONE"

 # Ugly hack to have libs in correct dir on 64bit archs.
 mkdir -p %{buildroot}%{_libdir}
-if [ "%{_lib}" != "lib" ]; then
-  mv %{buildroot}%{_prefix}/lib/lib* %{buildroot}%{_libdir}
+if [ "%{_libdir}" != "/usr/lib" ]; then
+  mv %{buildroot}/usr/lib/lib* %{buildroot}%{_libdir}
 fi

 cp -af lib/libnetpbm.a %{buildroot}%{_libdir}/libnetpbm.a
@ -176,16 +175,16 @@ done
 rm -f %{buildroot}%{_mandir}/man5/extendedopacity.5

 mkdir -p %{buildroot}%{_datadir}/netpbm
-mv %{buildroot}%{_prefix}/misc/*.map %{buildroot}%{_datadir}/netpbm/
-mv %{buildroot}%{_prefix}/misc/rgb.txt %{buildroot}%{_datadir}/netpbm/
-rm -rf %{buildroot}%{_prefix}/README
-rm -rf %{buildroot}%{_prefix}/VERSION
-rm -rf %{buildroot}%{_prefix}/link
-rm -rf %{buildroot}%{_prefix}/misc
-rm -rf %{buildroot}%{_prefix}/man
-rm -rf %{buildroot}%{_prefix}/pkginfo
-rm -rf %{buildroot}%{_prefix}/config_template
-rm -rf %{buildroot}%{_prefix}/pkgconfig_template
+mv %{buildroot}/usr/misc/*.map %{buildroot}%{_datadir}/netpbm/
+mv %{buildroot}/usr/misc/rgb.txt %{buildroot}%{_datadir}/netpbm/
+rm -rf %{buildroot}/usr/README
+rm -rf %{buildroot}/usr/VERSION
+rm -rf %{buildroot}/usr/link
+rm -rf %{buildroot}/usr/misc
+rm -rf %{buildroot}/usr/man
+rm -rf %{buildroot}/usr/pkginfo
+rm -rf %{buildroot}/usr/config_template
+rm -rf %{buildroot}/usr/pkgconfig_template

 # Don't ship the static library
 rm -f %{buildroot}%{_libdir}/lib*.a
@ -229,124 +228,6 @@ popd
 %doc userguide/*

 %changelog
-* Thu Jan 08 2026 Josef Ridky <jridky@redhat.com> - 11.13.00-1
- New upstream release 11.13.00
-
-* Tue Oct 14 2025 Josef Ridky <jridky@redhat.com> - 11.12.00-1
- New upstream release 11.12.00
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.10.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Apr 08 2025 Josef Ridky <jridky@redhat.com> - 11.10.00-1
- New upstream release 11.10.00 (#2355869)
-
-* Thu Feb 06 2025 Josef Ridky <jridky@redhat.com> - 11.09.00-2
- add LDFLAGS patch (RHEL-70899)
-
-* Tue Jan 28 2025 Josef Ridky <jridky@redhat.com> - 11.09.00-1
- New upstream release 11.09.00 (#2218312)
- Review and update license field
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.02.00-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Dec 13 2024 Lukáš Zaoral <lzaoral@redhat.com> - 11.02.00-9
- build netpbm with correct LDFLAGS (RHEL-70899)
-
-* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 11.02.00-8
- convert license to SPDX
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.02.00-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.02.00-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Florian Weimer <fweimer@redhat.com> - 11.02.00-5
- GCC 14 compatibility fixes:
-  Drop netpbm-cmuwtopbm.patch to fix an out-of-bounds stack write (#2259450)
-  Stub out unused converter/other/jpeg2000/libjasper_compat.c (#2259448)
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.02.00-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Nov 28 2023 Orion Poplawski <orion@nwra.com> - 11.02.00-3
- Rebuild for jasper 4.1
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.02.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Mar 27 2023 Josef Ridky <jridky@redhat.com> - 11.02.00-1
- New upstream release 11.02.00 (#2157125)
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.01.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jan 02 2023 Josef Ridky <jridky@redhat.com> - 11.01.00-1
- New upstream release 11.01.00 (#2157125)
-
-* Fri Dec 02 2022 Florian Weimer <fweimer@redhat.com> - 11.00.00-2
- Port downstream-specific patches to C99
-
-* Tue Oct 04 2022 Josef Ridky <jridky@redhat.com> - 11.00.00-1
- New upstream release 11.00.00 (#2130384)
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 10.99.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jun 28 2022 Josef Ridky <jridky@redhat.com> - 10.99.00-1
- New upstream release 10.99.00 (#2068865)
- Use %%set_build_flags to set environment variables
-
-* Sun Feb 13 2022 Josef Ridky <jridky@redhat.com> - 10.97.00-4
- Bump spec for new jasper
-
-* Fri Feb 11 2022 Josef Ridky <jridky@redhat.com> - 10.97.00-3
- Rebuild for new jasper
- 
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 10.97.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Jan 03 2022 Josef Ridky <jridky@redhat.com> - 10.97.00-1
- New upstream release 10.97.00 (#2035806)
-
-* Mon Oct 04 2021 Josef Ridky <jridky@redhat.com> - 10.96.00-1
- New upstream release 10.96.00 (#2007871)
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 10.95.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jul 15 2021 Josef Ridky <jridky@redhat.com> - 10.95.00-1
- New upstream release 10.95.00 (#1977974)
-
-* Wed Mar 31 2021 Josef Ridky <jridky@redhat.com> - 10.94.05-1
- New upstream release 10.94.05 (#1943837)
-
-* Mon Jan 25 2021 Josef Ridky <jridky@redhat.com> - 10.93.00-1
- New upstream release 10.93.00 (#1911159)
-
-* Wed Oct 07 2020 Josef Ridky <jridky@redhat.com> - 10.92.00-1
- New upstream release 10.92.00 (#1851753)
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 10.90.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Mar 26 2020 Josef Ridky <jridky@redhat.com> - 10.90.00-1
- New upstream release 10.90.00 (#1817279)
-
-* Wed Mar 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 10.89.00-3
- Add perl dependencies for build
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 10.89.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 06 2020 Josef Ridky <jridky@redhat.com> - 10.89.00-1
- New upstream release 10.89.00 (#1787801)
-
-* Mon Dec 09 2019 Josef Ridky <jridky@redhat.com> - 10.88.00-1
- New upstream release (#1756647)
-
 * Wed Aug 21 2019 Josef Ridky <jridky@redhat.com> - 10.87.00-1
 - New upstream release (#1725280)

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (netpbm-11.13.00.tar.xz) = 0914061c7c8d638147afb76cbf23609b3ae43aca4120e4297fd5db6887d5381469d6944cdbdc1c66d26f54ec68d62355693c08b830dde823061e37c51480b678
+SHA512 (netpbm-10.87.00.tar.xz) = 8245dd4b181d9e9b74b47af3e04e94143f03197ac4bc1f50009d66e16ec156c4d4a8fcefcfa90f6fea902f12cf3e5d3f34d220b1ed3333e2fe2d23da2293ea24
Author	SHA1	Message	Date
Josef Řídký	7a4880d91c	Merge branch 'master' into f29	2019-08-21 11:11:07 +02:00
Josef Řídký	840f244fee	Solve merge issue	2019-04-17 11:12:31 +02:00
Ralf Corsépius	94eb5b06f0	Package %{_libdir}/*.so (RHBZ#1676370).	2019-02-13 10:55:06 +01:00