When tripping over a GIT_ var, give a useful error

[packages/rpm-build-tools.git] / kde4diff.sh

diff --git a/kde4diff.sh b/kde4diff.sh
old mode 100644 (file)
new mode 100755 (executable)
index 6adcc82..057e505
--- a/kde4diff.sh
+++ b/kde4diff.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -x
-ver=4.2.0
+ver=4.6.0
 
 prog="$1"
 diffprog="$1"
@@ -10,7 +10,16 @@ diffprog="$1"
 # http://websvn.kde.org/branches/KDE/3.5/
 # svn://anonsvn.kde.org/home/kde/trunk/KDE/kdelibs
 
+# anonsvn.kde.org has few IP addresses which causes
+# that svn connects to two different servers which may
+# not be in sync. That causes problems with missing revisions.
+# Resolve to one IP and use that in both svn arguments.
+
+ANONSVN=$(host anonsvn.kde.org | awk ' { print $4; exit; } ' 2> /dev/null)
+[ -z "$ANONSVN" ] && ANONSVN="anonsvn.kde.org"
+
 [ "$diffprog" = "kdebase-workspace" -o "$diffprog" = "kdebase-runtime" ] && diffprog="kdebase"
+[ "$diffprog" = "kdepim-runtime" ] && diffprog="kdepim"
 
 filter() {
        set -x
@@ -24,6 +33,12 @@ filter() {
                kdebase-runtime)
                cat - | filterdiff -i "runtime/*"
                ;;
+               kdepim)
+               cat - | filterdiff -x "akonadi/*" | filterdiff -x "runtime/*"
+               ;;
+               kdepim-runtime)
+               cat - | filterdiff -i "runtime/*"
+               ;;
                *)
                cat -
                ;;
@@ -31,8 +46,8 @@ filter() {
 }
 
 svn diff \
-       svn://anonsvn.kde.org/home/kde/tags/KDE/${ver}/$diffprog \
-       svn://anonsvn.kde.org/home/kde/branches/KDE/4.2/$diffprog \
+       svn://${ANONSVN}/home/kde/tags/KDE/${ver}/$diffprog \
+       svn://${ANONSVN}/home/kde/branches/KDE/4.6/$diffprog \
        | filter "$prog" \
-       > $HOME/rpm/SOURCES/kde4-$prog-branch.diff
+       > kde4-$prog-branch.diff