X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=bin%2Fdiffdecvs;fp=bin%2Fdiffdecvs;h=ea34ddd61d0f3e959d11bf33e23ccf8f63099db6;hb=4fbb252e61aac99285a0f9d6b6c267f1ffc73d6f;hp=0fd50822a569eca4b0ec6e853ba56814daa12859;hpb=074e53a6ac63fb813fd809ca8d0f2d3d0f10311c;p=nethome.git

diff --git a/bin/diffdecvs b/bin/diffdecvs
index 0fd5082..ea34ddd 100755
--- a/bin/diffdecvs
+++ b/bin/diffdecvs
@@ -8,16 +8,24 @@ fi
 
 prog='
 	$wasdiff-- if $wasdiff;
-	$wasdiff=3 if /^diff -/;
+	$wasdiff=3 if /^diff -/ || /^revision /;
 	# Do not substitute already existing "./"... or "/dev/null".
-	s{^(\Q---\E )(?:gdb-[^/]*/|[.]/)?}{$1./} if $wasdiff==2;
-	s{^(\Q+++\E )(?:gdb-[^/]*/|[.]/)?}{$1./} if $wasdiff==1;
+	# gdb.spec is using -p1.
+	s{^(\Q---\E )gdb-[^/]*/}{$1./} if $wasdiff==2;
+	s{^(\Q+++\E )gdb-[^/]*/}{$1./} if $wasdiff==1;
+	# binutils.spec is using -p0.
+	s{^(\Q---\E )binutils-[^/]*/}{$1} if $wasdiff==2;
+	s{^(\Q+++\E )binutils-[^/]*/}{$1} if $wasdiff==1;
+	$f=$1 if m{^--- (\S+)\s*$} && $wasdiff==2;
+	s{^(\Q+++\E )-\t}{$1$f\t} && wasdiff==1;
 	next if /^[?]/;
 	next if /^Index:/;
 	next if /^={67}$/;
 	next if /^RCS file:/;
 	next if /^retrieving revision /;
 	next if /^diff -/;
+	next if /^revision /;
+	next if m{^/.*,v  -->  standard output$};
 	print;
 '
 if [ $# -eq 1 ];then