packages: google-chrome/google-chrome.spec - include buildid in release; b...

[glen]

Author: glen                         Date: Sun Dec 13 12:08:03 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- include buildid in release; buildid 33928

---- Files affected:
packages/google-chrome:
   google-chrome.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/google-chrome/google-chrome.spec
diff -u packages/google-chrome/google-chrome.spec:1.2 packages/google-chrome/google-chrome.spec:1.3
--- packages/google-chrome/google-chrome.spec:1.2	Wed Dec  9 18:22:57 2009
+++ packages/google-chrome/google-chrome.spec	Sun Dec 13 13:07:57 2009
@@ -1,14 +1,16 @@
 # $Revision$, $Date$
+%define		buildid	33928
+%define		rel		1
 Summary:	Google Chrome
 Name:		google-chrome
 Version:	4.0.249.30
-Release:	0.1
+Release:	0.%{buildid}.%{rel}
 License:	Multiple, see http://chrome.google.com/
 Group:		Applications/Networking
 Source0:	http://dl.google.com/linux/direct/%{name}-beta_current_i386.rpm
-# Source0-md5:	bf85e5d8d366fbe06606ab7bb5dadeac
+# Source0-md5:	858739adc287809386249cdf492e53f9
 Source1:	http://dl.google.com/linux/direct/%{name}-beta_current_x86_64.rpm
-# Source1-md5:	7e04f041372489e5249ccb7f9b661186
+# Source1-md5:	242f9b0bca48628544205b69230be422
 Source2:	%{name}.sh
 Source4:	find-lang.sh
 URL:		http://chrome.google.com/
@@ -46,12 +48,19 @@
 %prep
 %setup -qcT
 %ifarch %{ix86}
-rpm2cpio %{SOURCE0} | cpio -i -d
+SOURCE=%{S:0}
 %endif
 %ifarch %{x8664}
-rpm2cpio %{SOURCE1} | cpio -i -d
+SOURCE=%{S:1}
 %endif
 
+V=$(rpm -qp --qf '%{V}' $SOURCE)
+R=$(rpm -qp --qf '%{R}' $SOURCE)
+if [ version:$V != version:%{version} -o buildid:$R != buildid:%{buildid} ]; then
+	exit 1
+fi
+rpm2cpio $SOURCE | cpio -i -d
+
 mv opt/google/chrome .
 mv usr/share/man/man1/* .
 mv usr/share/gnome-control-center/default-apps .
@@ -148,6 +157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/12/13 12:07:57  glen
+- include buildid in release; buildid 33928
+
 Revision 1.2  2009/12/09 17:22:57  charles
 - fixed .desktop; BR: sed >= 4.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/google-chrome/google-chrome.spec?r1=1.2&r2=1.3&f=u