Author: glen Date: Wed Oct 26 21:43:57 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to stable 15.0.874.106 r107270
---- Files affected:
packages/google-chrome:
chrome-desktop.patch (1.3 -> 1.4) , google-chrome.spec (1.37 -> 1.38)
---- Diffs:
================================================================
Index: packages/google-chrome/chrome-desktop.patch
diff -u packages/google-chrome/chrome-desktop.patch:1.3
packages/google-chrome/chrome-desktop.patch:1.4
--- packages/google-chrome/chrome-desktop.patch:1.3 Fri Apr 8 08:30:58 2011
+++ packages/google-chrome/chrome-desktop.patch Wed Oct 26 23:43:52 2011
@@ -1,8 +1,11 @@
---- google-chrome-9.0.597.107/google-chrome.desktop~ 2011-03-06
13:19:44.000000000 +0200
-+++ google-chrome-9.0.597.107/google-chrome.desktop 2011-03-06
13:20:47.239498667 +0200
-@@ -110,4 +110,4 @@
+--- google-chrome-15.0.874.106/google-chrome.desktop~ 2011-10-27
00:22:10.000000000 +0300
++++ google-chrome-15.0.874.106/google-chrome.desktop 2011-10-27
00:24:02.861899987 +0300
+@@ -110,7 +110,7 @@
Icon=google-chrome
Type=Application
Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml_xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
+ X-Ayatana-Desktop-Shortcuts=NewWindow;NewIncognito
+
+ [NewWindow Shortcut Group]
================================================================
Index: packages/google-chrome/google-chrome.spec
diff -u packages/google-chrome/google-chrome.spec:1.37
packages/google-chrome/google-chrome.spec:1.38
--- packages/google-chrome/google-chrome.spec:1.37 Sun Jul 10 18:50:11 2011
+++ packages/google-chrome/google-chrome.spec Wed Oct 26 23:43:52 2011
@@ -2,19 +2,19 @@
# NOTE
# - to look and update to new version, use update-source.sh script
-%define svnrev 90304
+%define svnrev 107270
%define state stable
%define rel 1
Summary: Google Chrome
Name: google-chrome
-Version: 12.0.742.112
+Version: 15.0.874.106
Release: %{svnrev}.%{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
-# Source0-md5: 7939a9e67fe29b7001de26691cdab382
+# Source0-md5: b2d45d60abe54821e9c31c0367ef5f56
Source1:
http://dl.google.com/linux/chrome/rpm/stable/x86_64/%{name}-%{state}-%{version}-%{svnrev}.x86_64.rpm
-# Source1-md5: 22dcf5756b88d01d63ae3a557faa9b07
+# Source1-md5: 241a15cf13adb75f56359ef467e6a99b
Source2: %{name}.sh
Source4: find-lang.sh
Patch0: chrome-desktop.patch
@@ -39,9 +39,11 @@
%define nspr_caps libnspr4.so libplc4.so libplds4.so
%define ffmpeg_caps libffmpegsumo.so
%define jpeg_caps libpng12.so.0(PNG12_0)
+%define flash_caps libflashplayer.so
+%define chrome_caps libpdf.so libppGoogleNaClPluginChrome.so
# list of script capabilities (regexps) not to be used in Provides
-%define _noautoprov %{nss_caps} %{nspr_caps}
%{ffmpeg_caps} %{jpeg_caps}
+%define _noautoprov %{nss_caps} %{nspr_caps}
%{ffmpeg_caps} %{jpeg_caps} %{flash_caps} %{chrome_caps}
# do not require them either
%define _noautoreq %{_noautoprov}
@@ -167,6 +169,11 @@
%attr(755,root,root) %{_libdir}/%{name}/libgcflashplayer.so
%endif
+# nacl
+%attr(755,root,root) %{_libdir}/%{name}/nacl_helper
+%attr(755,root,root) %{_libdir}/%{name}/nacl_helper_bootstrap
+%attr(755,root,root) %{_libdir}/%{name}/nacl_irt_x86_*.nexe
+
# ffmpeg libs
%attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so
@@ -185,6 +192,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.38 2011/10/26 21:43:52 glen
+- up to stable 15.0.874.106 r107270
+
Revision 1.37 2011/07/10 16:50:11 glen
- up to 12.0.742.112, r90304
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/google-chrome/chrome-desktop.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/google-chrome/google-chrome.spec?r1=1.37&r2=1.38&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
