- Up to 12.0.714.0 r79369

[packages/chromium-browser-bin.git] / chromium-browser-bin.spec

diff --git a/chromium-browser-bin.spec b/chromium-browser-bin.spec
index dbbab149bf945cf0470264bdb56d1cb8067c4719..a8813c8a2ac865968560b0b6504d129a86b1329f 100644 (file)
--- a/chromium-browser-bin.spec
+++ b/chromium-browser-bin.spec
@@ -1,22 +1,24 @@
-%define                svnrev  45531
+# NOTES:
+# - to look for new tarball, use update-source.sh script
+%define                svnrev  79369
 %define                rel             1
 Summary:       A WebKit powered web browser
 Name:          chromium-browser-bin
-Version:       5.0.387.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:       9e07f41b3135446bf5f18c453f12f09a
+# NoSource0-md5:       246cc36f4463d626594564d54d5f2d61
 Source1:       chromium-browser64-r%{svnrev}.zip
-# NoSource1-md5:       17cec747e0f08cbf8b2a56390b20c3fe
+# NoSource1-md5:       a4e1230d56a75770e1dd6569a0d0dac5
 NoSource:      0
 NoSource:      1
 Source2:       chromium-browser.sh
 Source3:       chromium-browser.desktop
 Source4:       find-lang.sh
-Source5:       get_sources.sh
+Source5:       update-source.sh
 BuildRequires: rpmbuild(macros) >= 1.453
 BuildRequires: unzip
 Requires:      browser-plugins >= 2.0
@@ -25,6 +27,8 @@ 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)
 
@@ -57,18 +61,6 @@ web.
 This package contains 'inspector', allowing web developpers to inspect
 any element of a web page at runtime (html, javascript, css, ..)
 
-%package bookmark_manager
-Summary:       Bookmark manager for the chromium-browser
-Group:         Development/Tools
-Requires:      %{name} = %{version}-%{release}
-
-%description bookmark_manager
-Chromium is an open-source browser project that aims to build a safer,
-faster, and more stable way for all Internet users to experience the
-web.
-
-This package contains bookmark manager for the chromium-browser.
-
 %package l10n
 Summary:       chromium-browser language packages
 Group:         I18n
@@ -149,19 +141,21 @@ fi
 %{_pixmapsdir}/chromium-browser.png
 %{_desktopdir}/*.desktop
 %dir %{_libdir}/%{name}
+%{_libdir}/%{name}/resources.pak
 %{_libdir}/%{name}/chrome.pak
 %dir %{_libdir}/%{name}/locales
 %{_libdir}/%{name}/locales/en-US.pak
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/resources
-%{_libdir}/%{name}/resources/net_internals
-%{_libdir}/%{name}/resources/*_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
 
@@ -181,9 +175,5 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/%{name}/resources/inspector
 
-%files bookmark_manager
-%defattr(644,root,root,755)
-%{_libdir}/%{name}/resources/bookmark_manager
-
 %files l10n -f %{name}.lang
 %defattr(644,root,root,755)