X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kdediff.sh;h=38f4ef32f507320d6517dfa54ff7d180aadcb6fc;hb=ab517c2dbad11b5bc0a9604761f2165e94a71b50;hp=faec968586388362a1eca2cc6ba806eb9b3770d7;hpb=0b84059a4cdce18a522cf30aef1b20e2119cd965;p=packages%2Frpm-build-tools.git

diff --git a/kdediff.sh b/kdediff.sh
old mode 100644
new mode 100755
index faec968..38f4ef3
--- a/kdediff.sh
+++ b/kdediff.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
-
 ver=3.5.10
-pkg="$1"
+top=$(cd "$(dirname "$0")"; pwd)
 
 # http://websvn.kde.org/tags/KDE/3.5.5/
 # http://websvn.kde.org/branches/KDE/3.5/
@@ -10,20 +9,35 @@ pkg="$1"
 rundiff() {
 	local pkg=$1 ver=$2
 	
+	echo >&2 "Checkout $pkg"
+	cd $top
+	./builder -g -ns $pkg
+
+	cd $top/$pkg
 	echo >&2 "Running diff for $pkg-$ver"
 	LC_ALL=C svn diff \
 		svn://anonsvn.kde.org/home/kde/tags/KDE/$ver/$pkg \
 		svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/$pkg \
 		> $pkg-branch.diff.tmp
 
-	local c=$(grep -c Index: $pkg-branch.diff.tmp)
+	local c=$(grep -c '^--- ' $pkg-branch.diff.tmp)
 	if [ "$c" = 0 ]; then
 		echo >&2 "$pkg-branch.diff: empty, skipping"
 		rm $pkg-branch.diff.tmp
+		cvs remove -f $pkg-branch.diff 2>/dev/null
 		return
 	fi
 
 	cvs up -A $pkg-branch.diff
+	cvs add $pkg-branch.diff 2>/dev/null
+
+	local d=$(interdiff $pkg-branch.diff{,.tmp} | wc -l)
+	if [ "$d" = 0 ]; then
+		echo >&2 "$pkg-branch.diff: no new changes, skip"
+		rm $pkg-branch.diff.tmp
+		return
+	fi
+
 	mv $pkg-branch.diff.tmp $pkg-branch.diff
 	echo >&2 "Updated $pkg-branch.diff"
 }