extract v8 version properly

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 887f3a12cd47394ddddb17cbcd3f1d6ad037622f..07f2e6caf4fcfcb3c8de651e55563aca9b18608a 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -252,13 +252,14 @@ mv %{name}-%{branch}.%{basever}/* .
 # Google's versioning is interesting. They never reset "BUILD", which is how we jumped
 # from 3.0.201.0 to 4.0.202.0 as they moved to a new major branch
 . ./chrome/VERSION
-ver=$MAJOR.$MINOR.$BUILD.$PATCH
-test "$ver" = %{version}
+chrome=$MAJOR.$MINOR.$BUILD.$PATCH
+test "$chrome" = %{version}
 
 gyp_rev=$(grep googlecode_url.*gyp DEPS | cut -d'"' -f6 | cut -d@ -f2)
 test "$gyp_rev" = %{gyp_rev} || :
 
-v8_ver=$(awk 'NR=1 {print $NF; exit}' v8/ChangeLog || :)
+. ./v8.sh
+v8=$MAJOR_VERSION.$MINOR_VERSION.$BUILD_NUMBER.$PATCH_LEVEL
 
 # add chromium and pld to useragent
 %define pld_version %(echo %{pld_release} | sed -e 'y/[at]/[AT]/')

diff --git a/get-source.sh b/get-source.sh
index e4a3ec30afb172812ddfa78a872efdf704556760..30b1ce7e0d20ee26571c7ae9c2080f6eaecf6faf 100755 (executable)
--- a/get-source.sh
+++ b/get-source.sh
@@ -59,7 +59,7 @@ set -x
        cd $PACKAGE_NAME-$VERSION
        du -sh .
 
-       awk 'NR=1 {print $NF; exit}' v8/ChangeLog | tee -a v8.txt
+       awk '/^#define/ && /(MAJOR|MINOR)_VERSION|BUILD_NUMBER|PATCH_LEVEL/ { printf("%s=%s\n", $2, $3) }' v8/src/version.cc | tee -a v8.sh
 
        if [ "$CHANNEL" != "dev" ]; then
                sh -x $WORK_DIR/clean-source.sh emptydirs=1 v8=0 libvpx=0 mesa=0 re2=0