Author: caleb Date: Mon Jan 23 22:17:58 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- Up to r117846 release 18.0.1010.0
- Updated upgrade script to use devel release channel by default, trunk has
been horribly broken lately
---- Files affected:
packages/chromium-browser-bin:
chromium-browser-bin.spec (1.46 -> 1.47) , update-source.sh (1.18 -> 1.19)
---- Diffs:
================================================================
Index: packages/chromium-browser-bin/chromium-browser-bin.spec
diff -u packages/chromium-browser-bin/chromium-browser-bin.spec:1.46
packages/chromium-browser-bin/chromium-browser-bin.spec:1.47
--- packages/chromium-browser-bin/chromium-browser-bin.spec:1.46 Fri Oct
14 16:17:01 2011
+++ packages/chromium-browser-bin/chromium-browser-bin.spec Mon Jan 23
23:17:53 2012
@@ -1,11 +1,11 @@
# $Revision$, $Date$
# NOTES:
# - to look for new tarball, use update-source.sh script
-%define svnrev 105464
+%define svnrev 117846
%define rel 1
Summary: A WebKit powered web browser
Name: chromium-browser-bin
-Version: 16.0.908.0
+Version: 18.0.1010.0
Release: %{svnrev}.%{rel}
License: BSD, LGPL v2+ (ffmpeg)
Group: X11/Applications/Networking
@@ -187,6 +187,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2012/01/23 22:17:53 caleb
+- Up to r117846 release 18.0.1010.0
+- Updated upgrade script to use devel release channel by default, trunk has
been horribly broken lately
+
Revision 1.46 2011/10/14 14:17:01 mmazur
- up to 16.0.908.0
================================================================
Index: packages/chromium-browser-bin/update-source.sh
diff -u packages/chromium-browser-bin/update-source.sh:1.18
packages/chromium-browser-bin/update-source.sh:1.19
--- packages/chromium-browser-bin/update-source.sh:1.18 Tue Aug 2 13:12:55 2011
+++ packages/chromium-browser-bin/update-source.sh Mon Jan 23 23:17:53 2012
@@ -14,13 +14,10 @@
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
+elif [ "$1" == "trunk" ]; then
echo "Fetching latest revno... "
- rev=$(wget -q -O -
http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE)
- rev64=$(wget -q -O -
http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/LAST_CHANGE)
+ #rev=$(wget -q -O -
http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE)
+ #rev64=$(wget -q -O -
http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/LAST_CHANGE)
# be sure that we use same rev on both arch
if [ "$rev" != "$rev64" ]; then
echo "Current 32bit build ($rev) does not match 64bit build
($rev64)"
@@ -33,9 +30,14 @@
rev=$rev64
fi
fi
- echo "$rev"
- # TODO: use release branches instead of trunk. Current release can be
looked up like this:
- #linuxdev=$(wget -q -O - http://omahaproxy.appspot.com | grep
'^linux,dev' | cut -d, -f3)
+ echo "Using trunk $rev"
+elif [ "$1" ]; then
+ rev=$1
+ echo "Using $rev..."
+else
+ rev=$(wget -q -O - http://omahaproxy.appspot.com | grep '^linux,dev' |
cut -d, -f7)
+ version=$(wget -q -O - http://omahaproxy.appspot.com | grep
'^linux,dev' | cut -d, -f3)
+ echo "Using devel channel $rev..."
fi
if [ ! -f chromium-browser32-r$rev.zip ]; then
@@ -64,14 +66,15 @@
specfile=chromium-browser-bin.spec
oldrev=$(awk '/^%define[ ]+svnrev[ ]+/{print $NF}' $specfile)
if [ "$oldrev" != "$rev" ]; then
- # revno => VERSION hint by Caleb Maclennan <caleb#alerque.com>
- wget -q -O VERSION.sh
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/VERSION?revision=$rev
- if grep -Ev '^(MAJOR|MINOR|BUILD|PATCH)=[0-9]+$' VERSION.sh >&2; then
- echo >&2 "I refuse to execute garbled file for security
concerns"
- exit 1
+ if [ -z "$version" ]; then
+ wget -q -O VERSION.sh
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/VERSION?revision=$rev
+ if grep -Ev '^(MAJOR|MINOR|BUILD|PATCH)=[0-9]+$' VERSION.sh
>&2; then
+ echo >&2 "I refuse to execute garbled file for security
concerns"
+ exit 1
+ fi
+ . ./VERSION.sh
+ version=$MAJOR.$MINOR.$BUILD.$PATCH
fi
- . ./VERSION.sh
- version=$MAJOR.$MINOR.$BUILD.$PATCH
echo "Updating $specfile for $version r$rev"
sed -i -e "
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser-bin/chromium-browser-bin.spec?r1=1.46&r2=1.47&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser-bin/update-source.sh?r1=1.18&r2=1.19&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
