X-Git-Url: http://git.pld-linux.org/?p=packages%2Fchromium-browser-bin.git;a=blobdiff_plain;f=chromium-browser-bin.spec;h=72cea206379af92ee800acd247911fa6f223e684;hp=40c84d0c206a1ee0edd61d45ad63caf9ef9e75c1;hb=e5f0ca3813a1d153f356b664d4c3567f0ff05803;hpb=ba2e91d33f191d837a521e1b686b6fe6f2600bf6

diff --git a/chromium-browser-bin.spec b/chromium-browser-bin.spec
index 40c84d0..72cea20 100644
--- a/chromium-browser-bin.spec
+++ b/chromium-browser-bin.spec
@@ -1,30 +1,34 @@
-%define		svnrev	43829
+# NOTES:
+# - to look for new tarball, use update-source.sh script
+%define		svnrev	99948
 %define		rel		1
 Summary:	A WebKit powered web browser
 Name:		chromium-browser-bin
-Version:	5.0.371.0
+Version:	15.0.875.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:	6fd3a056234c0a883012de4b62879e42
+# NoSourceSource0-md5:	
 Source1:	chromium-browser64-r%{svnrev}.zip
-# NoSource1-md5:	e8d1e7cc6b774c2d6bccea7405b7f656
+# NoSourceSource1-md5:	
 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
 Requires:	libpng12 >= 1:1.2.42-2
 Requires:	nspr
 Requires:	nss
-Requires:	xdg-utils
+Requires:	xdg-utils >= 1.0.2-4
 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
@@ -101,6 +93,10 @@ mv chrome-linux/chrome-wrapper .
 mv chrome-linux/{chrome,chromium-browser}
 chmod a+x chrome-linux/lib*.so*
 
+# xdg-utils >= 1.0.2-4 satisfies these
+rm chrome-linux/xdg-settings
+rm chrome-linux/xdg-mime
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/plugins,%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir},%{_libdir}/%{name}/themes}
@@ -108,9 +104,9 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/plugins,%{_mandir}/man1
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/chromium-browser
 %{__sed} -i -e 's,@libdir@,%{_libdir}/%{name},' $RPM_BUILD_ROOT%{_bindir}/chromium-browser
 cp -a chrome-linux/* $RPM_BUILD_ROOT%{_libdir}/%{name}
-cp -a chromium-browser.1 $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/chromium-browser.png
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p chromium-browser.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/chromium-browser.png
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
@@ -149,18 +145,22 @@ 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}/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
+#%{_libdir}/%{name}/nacl_irt_x86_64.nexe
+
 # ffmpeg libs
 %attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so
 
@@ -173,16 +173,9 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/libsmime3.so.1d
 %attr(755,root,root) %{_libdir}/%{name}/libssl3.so.1d
 
-# bundle this copy until xdg-utils will have this itself
-%attr(755,root,root) %{_libdir}/%{name}/xdg-settings
-
 %files inspector
 %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)