- easy patch -p1 maker

Changed files:
    rpm-build.sh -> 1.25

diff --git a/rpm-build.sh b/rpm-build.sh
index 2855644c1875334f7721474750ba0731677638ab..036c3c9275e80e08146d3a2769f91736f80db0d2 100644 (file)
--- a/rpm-build.sh
+++ b/rpm-build.sh
@@ -144,6 +144,19 @@ cvslog() {
 }
 
 # does diff between FILE and FILE~
+# the diff can be applied with patch -p1
 d() {
-       dif $1{~,}
+       local file="$1"
+       local dir=${file%/*}
+       if [[ "$file" = /* ]]; then
+               # full path -- no idea where to strip
+               dir=.
+               diff=$file
+       else
+               # relative path -- keep one path component from current dir
+               dir=..
+               diff=${PWD##*/}/${file}
+       fi
+
+       (builtin cd "$dir"; dif $diff{~,})
 }