X-Git-Url: http://git.pld-linux.org/?p=packages%2Fchromium-browser-bin.git;a=blobdiff_plain;f=chromium-browser-bin.spec;h=bc9bfa64485405375e5b128adcecdfde6777070c;hp=884b4f8d3eddb61d065740fe359607889f5ff3cd;hb=611042d5bf1f3f01b67332167940a62733214d25;hpb=086aa7c1c7b9245dc3d87cd946347fa6e9318a3a

diff --git a/chromium-browser-bin.spec b/chromium-browser-bin.spec
index 884b4f8..bc9bfa6 100644
--- a/chromium-browser-bin.spec
+++ b/chromium-browser-bin.spec
@@ -1,16 +1,18 @@
-%define		svnrev	32603
+%define		svnrev	42096
 %define		rel		1
 Summary:	A WebKit powered web browser
 Name:		chromium-browser-bin
-Version:	4.0.254.0
-Release:	0.%{svnrev}.%{rel}
+Version:	5.0.359.0
+Release:	%{svnrev}.%{rel}
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 # sh get_sources.sh
-Source0:	chrome-linux32-r%{svnrev}.zip
-# Source0-md5:	7b5c41e3a558857cfc07ff8084a57d68
-Source1:	chrome-linux64-r%{svnrev}.zip
-# Source1-md5:	a5172b62106850b7e3c417a61fe6f0de
+Source0:	chromium-browser32-r%{svnrev}.zip
+# NoSource0-md5:	c3aee19e7e33664894563f84e9d8f5c4
+Source1:	chromium-browser64-r%{svnrev}.zip
+# NoSource1-md5:	8612af021929073cc0bed0b20a5fe39a
+NoSource:	0
+NoSource:	1
 Source2:	chromium-browser.sh
 Source3:	chromium-browser.desktop
 Source4:	find-lang.sh
@@ -18,6 +20,7 @@ Source5:	get_sources.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
@@ -35,12 +38,54 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		ffmpeg_caps	libffmpegsumo.so
 
 # list of script capabilities (regexps) not to be used in Provides
-%define		_noautoprov		%{nss_caps} %{nspr_caps} %{ffmpeg_caps}
-%define		_noautoreq		%{_noautoprov}
+%define		_noautoprov	%{nss_caps} %{nspr_caps} %{ffmpeg_caps}
+%define		_noautoreq	%{_noautoprov}
 
 %description
 Chromium is an open-source web browser, powered by WebKit.
 
+%package inspector
+Summary:	Page inspector for the chromium-browser
+Group:		Development/Tools
+Requires:	%{name} = %{version}-%{release}
+
+%description inspector
+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 '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
+Requires:	%{name} = %{version}-%{release}
+
+%description l10n
+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 language packages for 50 languages:
+
+ar, bg, bn, ca, cs, da, de, el, en-GB, es-419, es, et, fi, fil, fr,
+gu, he, hi, hr, hu, id, it, ja, kn, ko, lt, lv, ml, mr, nb, nl, or,
+pl, pt-BR, pt-PT, ro, ru, sk, sl, sr, sv, ta, te, th, tr, uk, vi,
+zh-CN, zh-TW
+
 %prep
 %ifarch %{ix86}
 %setup -qcT -a0
@@ -51,7 +96,7 @@ Chromium is an open-source web browser, powered by WebKit.
 %{__sed} -e 's,@localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh
 
 mv chrome-linux/product_logo_48.png .
-mv chrome-linux/chromium-browser.1 .
+mv chrome-linux/chrome.1 chromium-browser.1
 mv chrome-linux/chrome-wrapper .
 mv chrome-linux/{chrome,chromium-browser}
 chmod a+x chrome-linux/lib*.so*
@@ -80,6 +125,7 @@ done
 
 # find locales
 %find_lang %{name}.lang
+%{__sed} -i -e '/en-US.pak/d' %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,7 +138,7 @@ if [ "$1" = 0 ]; then
 	%update_browser_plugins
 fi
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
 
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
@@ -105,8 +151,9 @@ fi
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/chrome.pak
 %dir %{_libdir}/%{name}/locales
+%{_libdir}/%{name}/locales/en-US.pak
 %dir %{_libdir}/%{name}/plugins
-%{_libdir}/%{name}/resources
+%dir %{_libdir}/%{name}/resources
 %{_libdir}/%{name}/themes
 %attr(755,root,root) %{_libdir}/%{name}/chromium-browser
 
@@ -127,3 +174,14 @@ fi
 
 # 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)