X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fdiffdecvs;h=3224b51764318505d69534a3747492426f0bf92b;hp=0fd50822a569eca4b0ec6e853ba56814daa12859;hb=cbe38aac1a2fbde6d16d0720655d6a5adc3d07b1;hpb=ac5b4a80b959199a26104a5fffeda4c5d86bdc28

diff --git a/bin/diffdecvs b/bin/diffdecvs
index 0fd5082..3224b51 100755
--- a/bin/diffdecvs
+++ b/bin/diffdecvs
@@ -8,16 +8,27 @@ 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 /^index /;
 	next if /^={67}$/;
 	next if /^RCS file:/;
 	next if /^retrieving revision /;
 	next if /^diff -/;
+	next if /^revision /;
+	next if /^new file mode /;
+	next if /^deleted file mode /;
+	next if m{^/.*,v  -->  standard output$};
 	print;
 '
 if [ $# -eq 1 ];then