From 801355128cdab1feece8c28809a5b3cde61b22f0 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 27 Jun 2001 16:11:40 +0000
Subject: [PATCH] - info patch: fixed ogonkify.texi (one tab too much) - conf
 patch: added standard PLD Type1 fonts and AFMs paths - release 16

Changed files:
    a2ps-conf.patch -> 1.2
    a2ps-info.patch -> 1.3
    a2ps.spec -> 1.46
---
 a2ps-conf.patch | 30 ++++++++++++++++--------------
 a2ps-info.patch |  2 +-
 a2ps.spec       |  8 ++++----
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/a2ps-conf.patch b/a2ps-conf.patch
index 7b2330b..6ff3ac3 100644
--- a/a2ps-conf.patch
+++ b/a2ps-conf.patch
@@ -1,18 +1,20 @@
---- a2ps-4.13/configure.config	Wed Feb  9 09:32:31 2000
-+++ a2ps-4.13/configure	Thu Apr 27 19:56:05 2000
-@@ -8433,9 +8433,13 @@
- echo "configure:8434: checking for PostScript fonts path" 1>&5
+--- a2ps-4.13/configure.orig	Wed Mar  8 18:43:57 2000
++++ a2ps-4.13/configure	Wed Jun 27 14:58:26 2001
+@@ -8447,14 +8447,9 @@
+ echo "configure:8448: checking for PostScript fonts path" 1>&5
  # Try to find some PostScript fonts.
  # Find out if ghostscript is installed
-+# for ac_dir in /usr/local/ghostscript/fonts \
-+#  /usr/local/share/ghostscript/fonts;
- ac_psfont_path=
+-ac_psfont_path=
 -for ac_dir in /usr/local/ghostscript/fonts \
 -  /usr/local/share/ghostscript/fonts;
-+for ac_dir in /usr/share/fonts/default/Type1 \
-+    /usr/share/fonts/default/ghostscript \
-+    /usr/share/fonts/afms/adobe \
-+    /usr/share/fonts/ISO8859-2/Type1/afm ;
- do
-   if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
-     ac_psfont_path="$ac_psfont_path:$ac_dir";
+-do
+-  if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
+-    ac_psfont_path="$ac_psfont_path:$ac_dir";
+-  fi
+-done
++# for ac_dir in /usr/local/ghostscript/fonts \
++#  /usr/local/share/ghostscript/fonts;
++ac_psfont_path="/usr/share/fonts/Type1:/usr/share/fonts/Type1/afm:/usr/share/fonts/default/Type1:/usr/share/fonts/default/ghostscript:/usr/share/fonts/afms/adobe:/usr/share/fonts/ISO8859-2/Type1/afm"
+ if test -n "$ac_psfont_path"; then
+   PSFONT_PATH=`echo "$ac_psfont_path" | sed -e 's/^://'`
+ fi
diff --git a/a2ps-info.patch b/a2ps-info.patch
index 76a728b..81f5581 100644
--- a/a2ps-info.patch
+++ b/a2ps-info.patch
@@ -38,7 +38,7 @@ diff -Nru a2ps-4.12h/ogonkify/doc/ogonkify.texi a2ps-4.12h.new/ogonkify/doc/ogon
 +@dircategory Printing Tools:
  @direntry
 -* ogonkify: (ogonkify).            Ogonkify
-+* ogonkify: (ogonkify).				Ogonkify
++* ogonkify: (ogonkify).			Ogonkify
  @end direntry
  
  @ifinfo
diff --git a/a2ps.spec b/a2ps.spec
index c70a332..8c3f274 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -2,7 +2,7 @@ Summary:	Text to Postscript filter
 Summary(pl):	Filtr text/plain do  Postscriptu
 Name:		a2ps
 Version:	4.13b
-Release:	15
+Release:	16
 License:	GPL
 Group:		Applications/Text
 Group(de):	Applikationen/Text
@@ -97,7 +97,7 @@ Biblioteki statyczne do a2ps.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/share/a2ps/{afm,fonts}
+install -d $RPM_BUILD_ROOT%{_datadir}/a2ps/{afm,fonts}
 
 perl -pe 's/^lispdir = $/lispdir = \$(prefix)\/lib\/emacs\/site-lisp/g' contrib/emacs/Makefile >tmp
 
@@ -107,8 +107,8 @@ mv -f tmp contrib/emacs/Makefile
 
 gzip -9nf AUTHORS ChangeLog NEWS README THANKS
 
-install i18n-fonts-0.1/afm/*.afm %{buildroot}/usr/share/a2ps/afm
-install i18n-fonts-0.1/fonts/*.pfb %{buildroot}/usr/share/a2ps/fonts
+install i18n-fonts-0.1/afm/*.afm %{buildroot}%{_datadir}/a2ps/afm
+install i18n-fonts-0.1/fonts/*.pfb %{buildroot}%{_datadir}/a2ps/fonts
 
 %find_lang %{name}
 
-- 
2.43.0