From 34bdb724b00cd45fbabe57cd75eb716c56ff4e31 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mar 08 2007 17:17:29 +0000
Subject: - Use sed instead of perl for string replacement (bug #225235).

- Better install-info scriptlets (bug #225235).
- Added BuildRequires and Requires for more packages (bug #225235).
- a2ps.cfg needn't be %config (bug #225235).
- No need to gzip the info files (bug #225235).
- Resolves: rhbz#225235

---

diff --git a/a2ps.spec b/a2ps.spec
index 4171b72..1083880 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -1,7 +1,7 @@
 Summary: Converts text and other types of files to PostScript(TM)
 Name: a2ps
 Version: 4.13b
-Release: 61%{?dist}
+Release: 62%{?dist}
 License: GPL
 Group: Applications/Publishing
 Source: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -41,16 +41,18 @@ BuildRequires: /usr/bin/emacs, gperf, flex, libtool, texinfo, groff
 BuildRequires: ImageMagick
 BuildRequires: groff-perl
 BuildRequires: cups
+BuildRequires: gettext
+BuildRequires: psutils, gv, tetex-dvips, makeinfo, tetex-latex
 Url: http://www.inf.enst.fr/~demaille/a2ps/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: psutils
+Requires: psutils, ImageMagick, texinfo-tex, gv, gzip, bzip2, groff-perl
+Requires: tetex-dvips, tetex-latex, tetex-fonts, file
 Requires(post): coreutils
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Obsoletes: a2ps-i18n <= 0.1-1
 Provides: a2ps-i18n = 0.1-1
 
-BuildRequires: gettext
 
 %description
 The a2ps filter converts text and other types of files to PostScript(TM).
@@ -133,7 +135,7 @@ touch -r configure.in __timestamp_configure.in
 %patch31 -p1 -b .mb
 
 # Fix reference to a2ps binary (bug #112930).
-perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el
+sed -i -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el
 
 chmod -x lib/basename.c lib/xmalloc.c
 
@@ -192,7 +194,6 @@ rm -f %{buildroot}%{_libdir}/*
 rm -f %{buildroot}%{_includedir}/*
 
 rm -f %{buildroot}%{_infodir}/dir
-gzip %{buildroot}%{_infodir}/* || :
 
 %find_lang %name
 
@@ -200,9 +201,9 @@ gzip %{buildroot}%{_infodir}/* || :
 rm -rf %{buildroot}
 
 %post
-/sbin/install-info %{_infodir}/a2ps.info.gz %{_infodir}/dir
-/sbin/install-info %{_infodir}/ogonkify.info.gz %{_infodir}/dir
-/sbin/install-info %{_infodir}/regex.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/ogonkify.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/regex.info %{_infodir}/dir || :
 (cd %{_datadir}/a2ps/afm;
  ./make_fonts_map.sh > /dev/null 2>&1 || /bin/true
  if [ -f fonts.map.new ]; then
@@ -213,15 +214,15 @@ exit 0
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/a2ps.info.gz %{_infodir}/dir
-   /sbin/install-info --delete %{_infodir}/ogonkify.info.gz %{_infodir}/dir
-   /sbin/install-info --delete %{_infodir}/regex.info.gz %{_infodir}/dir
+   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+   /sbin/install-info --delete %{_infodir}/ogonkify.info %{_infodir}/dir || :
+   /sbin/install-info --delete %{_infodir}/regex.info %{_infodir}/dir || :
 fi
 exit 0
 
 %files -f %{name}.lang
-%defattr(-,root,root)
-%config (noreplace) %{_sysconfdir}/a2ps.cfg
+%defattr(-,root,root,-)
+%{_sysconfdir}/a2ps.cfg
 %config(noreplace) %{_sysconfdir}/a2ps-site.cfg
 %doc AUTHORS ChangeLog COPYING NEWS README TODO THANKS
 %{_bindir}/*
@@ -244,7 +245,12 @@ exit 0
 %dir %{_datadir}/a2ps
 
 %changelog
-* Thu Mar  8 2007 Tim Waugh <twaugh@redhat.com>
+* Thu Mar  8 2007 Tim Waugh <twaugh@redhat.com> 4.13b-62
+- Use sed instead of perl for string replacement (bug #225235).
+- Better install-info scriptlets (bug #225235).
+- Added BuildRequires and Requires for more packages (bug #225235).
+- a2ps.cfg needn't be %%config (bug #225235).
+- No need to gzip the info files (bug #225235).
 - Use external libtool and don't run the autotools (bug #225235).
 
 * Wed Feb 28 2007 Tim Waugh <twaugh@redhat.com> 4.13b-61