up to git 51ac219

diff --git a/eventum.spec b/eventum.spec
index 09e77dc014a883ca6a02c3d96156ca9cb577f579..36646c02b7313dd5d9adfc3a8ea79d00deb456be 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -10,8 +10,8 @@
 %bcond_without order   # with experimental order patch
 
 %define                php_min_version 5.1.2
-%define                subver  126
-%define                githash 42a2050
+%define                subver  142
+%define                githash 51ac219
 %define                rel             4.1
 %include       /usr/lib/rpm/macros.php
 Summary:       Eventum Issue / Bug tracking system
@@ -24,7 +24,7 @@ License:      GPL
 Group:         Applications/WWW
 #Source0:      http://launchpad.net/eventum/trunk/%{version}/+download/%{name}-%{version}.tar.gz
 Source0:       %{name}-%{version}-%{subver}-g%{githash}.tar.gz
-# Source0-md5: 166b934b2eccd6d70caa2202f44185b0
+# Source0-md5: 01dca2ac6f9ddaa651cdabfde1fdaab4
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron

diff --git a/update-source.sh b/update-source.sh
index 6b1e3a287de6a3cc9b144636f290e3251e18bc89..ffb609fb0d8801141366e01c35855b4bb31a4925 100644 (file)
--- a/update-source.sh
+++ b/update-source.sh
@@ -9,22 +9,27 @@ cd "$dir"
 
 if [ -f "$1" ]; then
        rev=$1
-       rev=${rev#eventum-*-r}
+       rev=${rev#eventum-*-}
        rev=${rev%.tar.gz}
-       echo "Using $rev..."
-
 elif [ "$1" ]; then
        rev=$1
-       echo "Using $rev..."
 fi
 
-oldrev=$(awk '/^%define[        ]+subver[       ]+/{print $NF}' $specfile)
-if [ "$oldrev" != "$rev" ]; then
-       echo "Updating $specfile for $rev"
-       sed -i -e "
-               s/^\(%define[ \t]\+subver[ \t]\+\)[0-9]\+\$/\1$rev/
-       " $specfile
-       ../builder -ncs -5 $specfile
-else
+subver=${rev%-*}
+githash=${rev#*-g}
+
+echo "Using $rev (subver: $subver, githash: $githash)..."
+
+oldsubver=$(awk '/^%define[\t ]+subver[\t ]+/{print $NF}' $specfile)
+oldgithash=$(awk '/^%define[\t ]+githash[\t ]+/{print $NF}' $specfile)
+if [ "$oldsubver" = "$subver" -a "$oldgithash" = "$githash" ]; then
        echo "Already up to date"
+       exit 0
 fi
+
+echo "Updating $specfile for $rev (subver: $subver, githash: $githash)..."
+sed -i -e "
+       s/^\(%define[ \t]\+subver[ \t]\+\)[0-9]\+\$/\1$subver/
+       s/^\(%define[ \t]\+githash[ \t]\+\)[0-9a-fg]\+\$/\1$githash/
+" $specfile
+../builder -ncs -5 $specfile