diff --git a/a2ps-wdiff.patch b/a2ps-wdiff.patch new file mode 100644 index 0000000..7315336 --- /dev/null +++ b/a2ps-wdiff.patch @@ -0,0 +1,40 @@ +--- 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 diff --git a/a2ps.spec b/a2ps.spec index 0565f5d..c534423 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -34,6 +34,7 @@ Patch24: a2ps-underquoted.patch 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 @@ and medias. # 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 @@ fi %dir %{_datadir}/a2ps %changelog +* Wed Mar 23 2005 Tim Waugh 4.13b-45 +- Make pdiff default to not requiring wdiff (bug #68537). + * Wed Mar 2 2005 Tim Waugh 4.13b-45 - Rebuild for new GCC.