rpms/a2ps/devel a2ps-U.patch,NONE,1.1 a2ps.spec,1.25,1.26

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	a2ps.spec 
Added Files:
	a2ps-U.patch 
Log Message:
* Thu May  5 2005 Tim Waugh <twaugh at redhat.com> 4.13b-47
- Make pdiff use diff(1) properly (bug #156916).


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

--- NEW FILE a2ps-U.patch ---
--- 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


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- a2ps.spec	23 Mar 2005 16:14:53 -0000	1.25
+++ a2ps.spec	5 May 2005 12:01:58 -0000	1.26
@@ -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 @@
 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 @@
 # 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 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Thu May  5 2005 Tim Waugh <twaugh at redhat.com> 4.13b-47
+- Make pdiff use diff(1) properly (bug #156916).
+
 * Wed Mar 23 2005 Tim Waugh <twaugh at redhat.com> 4.13b-46
 - Make pdiff default to not requiring wdiff (bug #68537).