X-Git-Url: http://git.pld-linux.org/?p=packages%2Fchromium-browser-bin.git;a=blobdiff_plain;f=chromium-browser-bin.spec;h=a8813c8a2ac865968560b0b6504d129a86b1329f;hp=a9ee499ebc892f5ad26c2da4dba5cc91ea4197a5;hb=0d85071819637c8dc86b8e74224b8fe3017ba228;hpb=05bb3b3c2d07ecde461b894107240821fca0f846

diff --git a/chromium-browser-bin.spec b/chromium-browser-bin.spec
index a9ee499..a8813c8 100644
--- a/chromium-browser-bin.spec
+++ b/chromium-browser-bin.spec
@@ -1,18 +1,18 @@
 # NOTES:
 # - to look for new tarball, use update-source.sh script
-%define		svnrev	50836
+%define		svnrev	79369
 %define		rel		1
 Summary:	A WebKit powered web browser
 Name:		chromium-browser-bin
-Version:	6.0.450.0
+Version:	12.0.714.0
 Release:	%{svnrev}.%{rel}
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 # sh get_sources.sh
 Source0:	chromium-browser32-r%{svnrev}.zip
-# NoSource0-md5:	c311415ce02bfa9d59be7a17f9e552c2
+# NoSource0-md5:	246cc36f4463d626594564d54d5f2d61
 Source1:	chromium-browser64-r%{svnrev}.zip
-# NoSource1-md5:	7f771a2576b4c6a355f496d5e0df8f83
+# NoSource1-md5:	a4e1230d56a75770e1dd6569a0d0dac5
 NoSource:	0
 NoSource:	1
 Source2:	chromium-browser.sh
@@ -27,6 +27,7 @@ Requires:	nspr
 Requires:	nss
 Requires:	xdg-utils
 Provides:	wwwbrowser
+Conflicts:	chromium-browser
 Obsoletes:	%{name}-bookmark_manager
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -146,15 +147,15 @@ fi
 %{_libdir}/%{name}/locales/en-US.pak
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/resources
-%{_libdir}/%{name}/resources/calendar_app
-%{_libdir}/%{name}/resources/docs_app
-%{_libdir}/%{name}/resources/gmail_app
 %{_libdir}/%{name}/themes
 %attr(755,root,root) %{_libdir}/%{name}/chromium-browser
 
 # These unique permissions are intentional and necessary for the sandboxing
 %attr(4555,root,root) %{_libdir}/%{name}/chrome_sandbox
 
+# Native Client plugin, to use launch with --enable-nacl
+%attr(755,root,root) %{_libdir}/%{name}/libppGoogleNaClPluginChrome.so
+
 # ffmpeg libs
 %attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so