rpms/a2ps/devel a2ps-wdiff.patch,NONE,1.1 a2ps.spec,1.23,1.24

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12813

Modified Files:
	a2ps.spec 
Added Files:
	a2ps-wdiff.patch 
Log Message:
* Wed Mar 23 2005 Tim Waugh <twaugh at redhat.com> 4.13b-45
- Make pdiff default to not requiring wdiff (bug #68537).


a2ps-wdiff.patch:
 pdiff.in |    4 +---
 pdiff.m4 |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE a2ps-wdiff.patch ---
--- a2ps-4.13/contrib/pdiff.m4.wdiff	2005-03-23 15:43:47.000000000 +0000
+++ a2ps-4.13/contrib/pdiff.m4	2005-03-23 15:46:13.000000000 +0000
@@ -15,7 +15,7 @@
 a2ps=${A2PS:-a2ps}
 a2ps_options=
 debug=
-diff_on=words
+diff_on=lines
 diff_prog=${DIFF:-diff}
 diff_options='-u'
 file=
@@ -40,8 +40,6 @@
  -h, --help           display this help and exit
  -v, --version        display version information and exit
  -q, --quiet          don't print informational messages
- -l, --lines          search for line differences (\`diff')
- -w, --words          search for word differences (\`wdiff')
  -o, --output=FILE    save the output in FILE
 
 Options for a2ps are given after \`--', for instance
--- a2ps-4.13/contrib/pdiff.in.wdiff	2005-03-23 15:43:50.000000000 +0000
+++ a2ps-4.13/contrib/pdiff.in	2005-03-23 15:46:16.000000000 +0000
@@ -29,7 +29,7 @@
 a2ps=${A2PS:-a2ps}
 a2ps_options=
 debug=
-diff_on=words
+diff_on=lines
 diff_prog=${DIFF:-diff}
 diff_options='-u'
 file=
@@ -54,8 +54,6 @@
  -h, --help           display this help and exit
  -v, --version        display version information and exit
  -q, --quiet          don't print informational messages
- -l, --lines          search for line differences (\`diff')
- -w, --words          search for word differences (\`wdiff')
  -o, --output=FILE    save the output in FILE
 
 Options for a2ps are given after \`--', for instance


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- a2ps.spec	2 Mar 2005 13:48:13 -0000	1.23
+++ a2ps.spec	23 Mar 2005 16:14:30 -0000	1.24
@@ -34,6 +34,7 @@
 Patch25: a2ps-autoconf.patch
 Patch26: a2ps-make-fonts-map.patch
 Patch27: a2ps-netscape.patch
+Patch28: a2ps-wdiff.patch
 Requires: fileutils sh-utils info
 BuildRequires: /usr/bin/emacs, gperf, flex, libtool, texinfo
 Url: http://www.inf.enst.fr/~demaille/a2ps/
@@ -108,6 +109,9 @@
 # Don't try to run netscape.  Run mozilla instead (bug #121393).
 %patch27 -p1 -b .netscape
 
+# Make pdiff default to not requiring wdiff (bug #68537).
+%patch28 -p1 -b .wdiff
+
 # Fix reference to a2ps binary (bug #112930).
 perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el
 libtoolize --copy --force
@@ -218,6 +222,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Wed Mar 23 2005 Tim Waugh <twaugh at redhat.com> 4.13b-45
+- Make pdiff default to not requiring wdiff (bug #68537).
+
 * Wed Mar  2 2005 Tim Waugh <twaugh at redhat.com> 4.13b-45
 - Rebuild for new GCC.