From 0ceef745bc05f6c78bf39ab5bb0a36cb24849086 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: May 05 2005 12:01:58 +0000
Subject: - Make pdiff use diff(1) properly (bug #156916).


---

diff --git a/a2ps-U.patch b/a2ps-U.patch
new file mode 100644
index 0000000..48c5a90
--- /dev/null
+++ b/a2ps-U.patch
@@ -0,0 +1,22 @@
+--- a2ps-4.13/contrib/pdiff.in.U	2005-05-05 12:46:05.000000000 +0100
++++ a2ps-4.13/contrib/pdiff.in	2005-05-05 12:47:34.000000000 +0100
+@@ -182,7 +182,7 @@
+     # We need the total number of lines
+     lines=`wc -l $file1 $file2 | sed -n 3p`
+     lines=`set -- $lines && echo $1`
+-    $diff_prog $diff_options -$lines $file1 $file2	\
++    $diff_prog $diff_options -U$lines $file1 $file2	\
+        | $a2ps -gEudiff $a2ps_options || exit 1
+     ;;
+ esac
+--- a2ps-4.13/contrib/pdiff.m4.U	2005-05-05 12:47:54.000000000 +0100
++++ a2ps-4.13/contrib/pdiff.m4	2005-05-05 12:53:10.000000000 +0100
+@@ -100,7 +100,7 @@
+     # We need the total number of lines
+     lines=`wc -l $file1 $file2 | sed -n 3p`
+     lines=`set -- $lines && echo $1`
+-    $diff_prog $diff_options -$lines $file1 $file2	\
++    $diff_prog $diff_options -U$lines $file1 $file2	\
+        | $a2ps -gEudiff $a2ps_options || exit 1
+     ;;
+ esac
diff --git a/a2ps.spec b/a2ps.spec
index 6f03e7d..7f44cf1 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -1,5 +1,5 @@
 %define	ver	4.13b
-%define rel 46
+%define rel 47
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
@@ -35,6 +35,7 @@ Patch25: a2ps-autoconf.patch
 Patch26: a2ps-make-fonts-map.patch
 Patch27: a2ps-netscape.patch
 Patch28: a2ps-wdiff.patch
+Patch29: a2ps-U.patch
 Requires: fileutils sh-utils info
 BuildRequires: /usr/bin/emacs, gperf, flex, libtool, texinfo
 Url: http://www.inf.enst.fr/~demaille/a2ps/
@@ -112,6 +113,9 @@ and medias.
 # Make pdiff default to not requiring wdiff (bug #68537).
 %patch28 -p1 -b .wdiff
 
+# Make pdiff use diff(1) properly (bug #156916).
+%patch29 -p1 -b .U
+
 # Fix reference to a2ps binary (bug #112930).
 perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el
 libtoolize --copy --force
@@ -222,6 +226,9 @@ fi
 %dir %{_datadir}/a2ps
 
 %changelog
+* Thu May  5 2005 Tim Waugh <twaugh@redhat.com> 4.13b-47
+- Make pdiff use diff(1) properly (bug #156916).
+
 * Wed Mar 23 2005 Tim Waugh <twaugh@redhat.com> 4.13b-46
 - Make pdiff default to not requiring wdiff (bug #68537).