packages: google-chrome/chrome-desktop.patch, google-chrome/google-chrome.s...

glen glen at pld-linux.org
Thu Apr 15 11:39:17 CEST 2010


Author: glen                         Date: Thu Apr 15 09:39:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.0.342.9, r43360

---- Files affected:
packages/google-chrome:
   chrome-desktop.patch (1.1 -> 1.2) , google-chrome.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/google-chrome/chrome-desktop.patch
diff -u packages/google-chrome/chrome-desktop.patch:1.1 packages/google-chrome/chrome-desktop.patch:1.2
--- packages/google-chrome/chrome-desktop.patch:1.1	Sun Dec 13 13:53:24 2009
+++ packages/google-chrome/chrome-desktop.patch	Thu Apr 15 11:39:11 2010
@@ -1,8 +1,8 @@
---- google-chrome-4.0.249.30/google-chrome.desktop~	2009-12-13 14:15:20.000000000 +0200
-+++ google-chrome-4.0.249.30/google-chrome.desktop	2009-12-13 14:19:58.082677897 +0200
-@@ -111,4 +111,4 @@
- Icon=/usr/share/pixmaps/google-chrome.png
+--- google-chrome-5.0.342.9/google-chrome.desktop~	2010-04-15 12:26:49.000000000 +0300
++++ google-chrome-5.0.342.9/google-chrome.desktop	2010-04-15 12:27:09.332078235 +0300
+@@ -110,4 +110,4 @@
+ Icon=google-chrome
  Type=Application
- Categories=Application;Network;WebBrowser;
+ Categories=Network;WebBrowser;
 -MimeType=text/html;text/xml;application/xhtml_xml;
 +MimeType=text/html;text/xml;application/xhtml+xml;

================================================================
Index: packages/google-chrome/google-chrome.spec
diff -u packages/google-chrome/google-chrome.spec:1.12 packages/google-chrome/google-chrome.spec:1.13
--- packages/google-chrome/google-chrome.spec:1.12	Tue Mar  9 22:46:10 2010
+++ packages/google-chrome/google-chrome.spec	Thu Apr 15 11:39:11 2010
@@ -1,16 +1,18 @@
 # $Revision$, $Date$
-%define		buildid	34537
+# NOTE
+# - to look for new version, use update-source.sh script
+%define		svnrev	43360
 %define		rel		1
 Summary:	Google Chrome
 Name:		google-chrome
-Version:	4.0.249.43
-Release:	%{buildid}.%{rel}
+Version:	5.0.342.9
+Release:	%{svnrev}.%{rel}
 License:	Multiple, see http://chrome.google.com/
 Group:		Applications/Networking
-Source0:	http://dl.google.com/linux/rpm/stable/i386/%{name}-beta-%{version}-%{buildid}.i386.rpm
-# Source0-md5:	e090d577a7b12181290dba715ec9f80b
-Source1:	http://dl.google.com/linux/rpm/stable/x86_64/%{name}-beta-%{version}-%{buildid}.x86_64.rpm
-# Source1-md5:	ae8d79ad89e6d9d9d1fcbc4d482badfd
+Source0:	http://dl.google.com/linux/rpm/stable/i386/%{name}-beta-%{version}-%{svnrev}.i386.rpm
+# Source0-md5:	d7aaec68705d163e3ba475254aec3043
+Source1:	http://dl.google.com/linux/rpm/stable/x86_64/%{name}-beta-%{version}-%{svnrev}.x86_64.rpm
+# Source1-md5:	eef4dfe148d2529f3ba179055ceae374
 Source2:	%{name}.sh
 Source4:	find-lang.sh
 Patch0:		chrome-desktop.patch
@@ -62,9 +64,9 @@
 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
+V=$(rpm -qp --nodigest --nosignature --qf '%{V}' $SOURCE)
+R=$(rpm -qp --nodigest --nosignature --qf '%{R}' $SOURCE)
+if [ version:$V != version:%{version} -o svnrev:$R != svnrev:%{svnrev} ]; then
 	exit 1
 fi
 rpm2cpio $SOURCE | cpio -i -d
@@ -171,6 +173,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/04/15 09:39:11  glen
+- up to 5.0.342.9, r43360
+
 Revision 1.12  2010/03/09 21:46:10  glen
 - default app support included in gnome-control-center-2.28.1-3
 
================================================================

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



More information about the pld-cvs-commit mailing list