update to 21.0.1180.57, adobe-flash 11.3.31.222

diff --git a/google-chrome.spec b/google-chrome.spec
index f260ff10ad0e08d2b053e32695f46fa178cd711a..d61d5522bd24568977a96eead0c618be19049e67 100644 (file)
--- a/google-chrome.spec
+++ b/google-chrome.spec
@@ -1,21 +1,21 @@
 # NOTE
 # - to look and update to new version, use update-source.sh script
 
-%define                flashv  11.3.31.115
-%define                svnrev  145807
+%define                flashv  11.3.31.222
+%define                svnrev  148591
 #define                rel             %{nil}
 %define                state   stable
 Summary:       Google Chrome
 Name:          google-chrome
-Version:       20.0.1132.57
+Version:       21.0.1180.57
 Release:       %{svnrev}%{?rel:.%{rel}}
 License:       Multiple, see http://chrome.google.com/
 Group:         Applications/Networking
 Source0:       http://dl.google.com/linux/chrome/rpm/stable/i386/%{name}-%{state}-%{version}-%{svnrev}.i386.rpm
-# NoSource0-md5:       c55444fdd9420d0ce24811c25d9335af
+# NoSource0-md5:       a8a2975d37844803873a433ba12d245e
 NoSource:      0
 Source1:       http://dl.google.com/linux/chrome/rpm/stable/x86_64/%{name}-%{state}-%{version}-%{svnrev}.x86_64.rpm
-# NoSource1-md5:       39d703e081a4896b7659a06518d7366f
+# NoSource1-md5:       731f135c402630843ca96c0951cec3e3
 NoSource:      1
 Source2:       %{name}.sh
 Source4:       find-lang.sh

diff --git a/update-source.sh b/update-source.sh
index 3231ebebccc60d24985af2093fbb18ee9432ae7a..c42220b86dd851e742304da26e2be5675c2b1aaf 100755 (executable)
--- a/update-source.sh
+++ b/update-source.sh
@@ -13,15 +13,19 @@ case "${branch}" in
                ;;
 esac
 
-sourceurl=http://dl.google.com/linux/chrome/rpm/stable/$arch/
+sourceurl=http://dl.google.com/linux/chrome/rpm/stable/$arch
 
 set -e
 
 echo -n "Fetching latest version... "
 t=$(mktemp)
 
-poldek -q --st=metadata --source "$sourceurl" --update
-poldek -q --skip-installed --st=metadata --source "$sourceurl" --cmd "ls google-chrome-$branch" > $t
+# poldek is buggy, see https://bugs.launchpad.net/poldek/+bug/1026762
+#poldek -q --st=metadata --source "$sourceurl/" --update
+#poldek -q --skip-installed --st=metadata --source "$sourceurl/" --cmd "ls google-chrome-$branch" > $t
+
+wget -c $sourceurl/repodata/primary.xml.gz
+zcat primary.xml.gz | perl -ne 'm{<name>google-chrome-'$branch'</name>} and m{<version epoch="0" ver="([\d.]+)" rel="(\d+)"/>} and print "$1 $2"' > $t
 
 set -- $(sed -re "s,^.+-([^-]+)-([^-]+).$arch$,\1 \2," $t)