From e20f35e4a9f26a0ed11c60c0b242217bd229703a Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Dec 09 2004 13:05:35 +0000
Subject: - Fix problems in make_fonts_map script (bug #142299). Patch from

- Michal Jaegermann.

---

diff --git a/a2ps-make-fonts-map.patch b/a2ps-make-fonts-map.patch
new file mode 100644
index 0000000..e029b4b
--- /dev/null
+++ b/a2ps-make-fonts-map.patch
@@ -0,0 +1,29 @@
+--- a2ps-4.13/afm/make_fonts_map.sh.make-fonts-map	1999-01-20 14:28:27.000000000 +0000
++++ a2ps-4.13/afm/make_fonts_map.sh	2004-12-09 12:34:45.517150083 +0000
+@@ -58,23 +58,15 @@
+ do
+   # Extract the font name.
+   name=`sed -n -e '/^FontName/{
+-s/FontName[ ]*\([-a-zA-Z]*\).*/\1/p
++s/FontName[ ]*\([-a-zA-Z0-9]*\).*/\1/p
+ q
+ }' $file`
+   shortname=`basename $file | sed -e 's/\.[^\.]*$//g'`
+   if test x$name = x; then :; else
+-    # This is probably not a correct AFM file.
++    # If name was empty this is probably not a correct AFM file.
+     # (For instance Ogonkify's pseudo AFMs that define the encodings)
+     # Forget it.
+-    col1=`echo "$name$many_spaces" | sed -e 's/^\('$many_dots'\).*$/\1/g'`
+-    # Make sure the name has not been cut
+-    case "$col1" in
+-      $name*) ;;
+-      *) echo "A name has been cut ($name -> $col1)." 1>&2
+-	 exit 1 ;;
+-    esac
+-    col2="$shortname"
+-    echo "$col1$col2" >> fonts.map.new
++    printf "%-30s %s\n" $name $shortname >> fonts.map.new
+   fi
+ done
+ 
diff --git a/a2ps.spec b/a2ps.spec
index e091aa9..6910e90 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -1,5 +1,5 @@
 %define	ver	4.13b
-%define rel 42
+%define rel 43
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
@@ -32,6 +32,7 @@ Patch22: a2ps-shell.patch
 Patch23: a2ps-includes.patch
 Patch24: a2ps-underquoted.patch
 Patch25: a2ps-autoconf.patch
+Patch26: a2ps-make-fonts-map.patch
 Requires: fileutils sh-utils info
 BuildRequires: /usr/bin/emacs, gperf, flex, libtool, texinfo
 Url: http://www.inf.enst.fr/~demaille/a2ps/
@@ -99,6 +100,10 @@ and medias.
 # Fixed configure.in.
 %patch25 -p1 -b .autoconf
 
+# Fix problems in make_fonts_map script (bug #142299).  Patch from
+# Michal Jaegermann.
+%patch26 -p1 -b .make-fonts-map
+
 # Fix reference to a2ps binary (bug #112930).
 perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el
 libtoolize --copy --force
@@ -209,6 +214,10 @@ fi
 %dir %{_datadir}/a2ps
 
 %changelog
+* Thu Dec  9 2004 Tim Waugh <twaugh@redhat.com> 4.13b-43
+- Fix problems in make_fonts_map script (bug #142299).  Patch from
+- Michal Jaegermann.
+
 * Tue Dec  7 2004 Tim Waugh <twaugh@redhat.com> 4.13b-42
 - Fixed configure.in.
 - Fixed m4 files.