From c1ed16b4a97e26e6a6db0a08ca52046f39472e37 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Feb 02 2005 16:40:30 +0000
Subject: - Don't try to run netscape. Run mozilla instead (bug #121393).


---

diff --git a/a2ps-netscape.patch b/a2ps-netscape.patch
new file mode 100644
index 0000000..738a606
--- /dev/null
+++ b/a2ps-netscape.patch
@@ -0,0 +1,31 @@
+--- a2ps-4.13/etc/a2ps_cfg.in.netscape	2005-02-02 16:22:36.000000000 +0000
++++ a2ps-4.13/etc/a2ps_cfg.in	2005-02-02 16:40:06.431499603 +0000
+@@ -265,7 +265,8 @@
+ @COM_PSUTILS@@COM_dvips@   fi
+ 
+ ########## HTML files
+-# Pass HTML to Netscape, hoping that there is an Netscape running...
++# Pass HTML to Mozilla, hoping that there is a Mozilla running...
++# (Previously had used Netscape.  Following comments refer to Netscape:)
+ # Tricks:
+ # 1. Netscape can't output on stdout, hence use a tmp file (#f0)
+ # 2. openfile refuses relative paths, so prepend cwd (%d) when relative
+@@ -274,14 +275,14 @@
+ #    loaded page (not that of openfile).  So run Netscape twice.
+ # 4. It asks the user if s/he wants to replace an existing output file,
+ #    so rm before.
+-@COM_PSUTILS@Delegation: Netscape html:ps    \
++@COM_PSUTILS@Delegation: Mozilla html:ps    \
+ @COM_PSUTILS@  rm -f #f0; \
+ @COM_PSUTILS@  if echo '$f' | grep '^/' >/dev/null 2>&1; then \
+-@COM_PSUTILS@    ${NETSCAPE:-netscape} -noraise -remote 'openfile($f)'; \
++@COM_PSUTILS@    ${MOZILLA:-mozilla} -noraise -remote 'openfile($f)'; \
+ @COM_PSUTILS@  else \
+-@COM_PSUTILS@    ${NETSCAPE:-netscape} -noraise -remote 'openfile(%d/$f)'; \
++@COM_PSUTILS@    ${MOZILLA:-mozilla} -noraise -remote 'openfile(%d/$f)'; \
+ @COM_PSUTILS@  fi && \
+-@COM_PSUTILS@  ${NETSCAPE:-netscape} -noraise -remote 'saveas(#f0,postscript)' && \
++@COM_PSUTILS@  ${MOZILLA:-mozilla} -noraise -remote 'saveas(#f0,postscript)' && \
+ @COM_PSUTILS@  #{del.psselect} #f0 | #{del.psnup}
+ 
+ ########## MetaFont / MetaPost files
diff --git a/a2ps.spec b/a2ps.spec
index 345d9dd..24a887c 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -1,5 +1,5 @@
 %define	ver	4.13b
-%define rel 43
+%define rel 44
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
@@ -33,6 +33,7 @@ Patch23: a2ps-includes.patch
 Patch24: a2ps-underquoted.patch
 Patch25: a2ps-autoconf.patch
 Patch26: a2ps-make-fonts-map.patch
+Patch27: a2ps-netscape.patch
 Requires: fileutils sh-utils info
 BuildRequires: /usr/bin/emacs, gperf, flex, libtool, texinfo
 Url: http://www.inf.enst.fr/~demaille/a2ps/
@@ -104,6 +105,9 @@ and medias.
 # Michal Jaegermann.
 %patch26 -p1 -b .make-fonts-map
 
+# Don't try to run netscape.  Run mozilla instead (bug #121393).
+%patch27 -p1 -b .netscape
+
 # Fix reference to a2ps binary (bug #112930).
 perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el
 libtoolize --copy --force
@@ -214,6 +218,9 @@ fi
 %dir %{_datadir}/a2ps
 
 %changelog
+* Wed Feb  2 2005 Tim Waugh <twaugh@redhat.com> 4.13b-44
+- Don't try to run netscape.  Run mozilla instead (bug #121393).
+
 * Thu Dec  9 2004 Tim Waugh <twaugh@redhat.com> 4.13b-43
 - Fixed font path (bug #142294).
 - Fixed problems in make_fonts_map script (bug #142299).  Patch from