packages: chromium-browser-bin/chromium-browser-bin.spec, chromium-browser-...

[caleb]

Author: caleb                        Date: Tue Sep 28 09:25:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Added argument for downloader script to use svn version from spec file instead of latest.

---- Files affected:
packages/chromium-browser-bin:
   chromium-browser-bin.spec (1.33 -> 1.34) , update-source.sh (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/chromium-browser-bin/chromium-browser-bin.spec
diff -u packages/chromium-browser-bin/chromium-browser-bin.spec:1.33 packages/chromium-browser-bin/chromium-browser-bin.spec:1.34
--- packages/chromium-browser-bin/chromium-browser-bin.spec:1.33	Tue Sep 28 11:01:52 2010
+++ packages/chromium-browser-bin/chromium-browser-bin.spec	Tue Sep 28 11:25:12 2010
@@ -185,8 +185,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2010/09/28 09:25:12  caleb
+- Added argument for downloader script to use svn version from spec file instead of latest.
+
 Revision 1.33  2010/09/28 09:01:52  caleb
-Up to 7.0.536.0, based on svn r60634 from yesterday. Seems pretty stable after the recent rash of crashy bin tarballs.
+- Up to 7.0.536.0, based on svn r60634 from yesterday. Seems pretty stable after the recent rash of crashy bin tarballs.
 
 Revision 1.32  2010/06/25 13:47:26  caleb
 - Binary packages does not currently play nice with built from source package, conflict until they can get along

================================================================
Index: packages/chromium-browser-bin/update-source.sh
diff -u packages/chromium-browser-bin/update-source.sh:1.14 packages/chromium-browser-bin/update-source.sh:1.15
--- packages/chromium-browser-bin/update-source.sh:1.14	Tue May 25 11:38:15 2010
+++ packages/chromium-browser-bin/update-source.sh	Tue Sep 28 11:25:12 2010
@@ -1,8 +1,20 @@
 #!/bin/sh
+# Usage:
+# ./update-source.sh [spec|rev]
+#     Download latest binary tarball based on latest release from
+#     buildbot, current version referenced in spec file, or custom
+#     version number.
 set -e
 dropin=
 
-if [ "$1" ]; then
+# Work in package dir
+dir=$(dirname "$0")
+cd "$dir"
+
+if [ "$1" == "spec" ]; then
+	rev=$(grep -e "^%define.*svnrev" chromium-browser-bin.spec | cut -f4)
+	echo "Using $rev from spec file"
+elif [ "$1" ]; then
 	rev=$1
 	echo "Using $rev..."
 else
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser-bin/chromium-browser-bin.spec?r1=1.33&r2=1.34&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser-bin/update-source.sh?r1=1.14&r2=1.15&f=u