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

diff --git a/chromium-browser-bin.spec b/chromium-browser-bin.spec
index 0c8e23e..884b4f8 100644
--- a/chromium-browser-bin.spec
+++ b/chromium-browser-bin.spec
@@ -1,22 +1,28 @@
-%define		svnver  26908
-%define		rel		0.6
+%define		svnrev	32603
+%define		rel		1
 Summary:	A WebKit powered web browser
 Name:		chromium-browser-bin
-Version:	4.0.213.0
-Release:	0.%{svnver}.%{rel}
+Version:	4.0.254.0
+Release:	0.%{svnrev}.%{rel}
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
-Source0:	http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/%{svnver}/chrome-linux.zip
-# NoSource0-md5:	1982ad180b913ac1733ce0ba87ff8dff
-NoSource:	0
+# sh get_sources.sh
+Source0:	chrome-linux32-r%{svnrev}.zip
+# Source0-md5:	7b5c41e3a558857cfc07ff8084a57d68
+Source1:	chrome-linux64-r%{svnrev}.zip
+# Source1-md5:	a5172b62106850b7e3c417a61fe6f0de
 Source2:	chromium-browser.sh
 Source3:	chromium-browser.desktop
 Source4:	find-lang.sh
+Source5:	get_sources.sh
+BuildRequires:	rpmbuild(macros) >= 1.453
+BuildRequires:	unzip
 Requires:	browser-plugins >= 2.0
 Requires:	nspr
 Requires:	nss
+Requires:	xdg-utils
 Provides:	wwwbrowser
-ExclusiveArch:	%{x8664}
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		find_lang 	sh find-lang.sh %{buildroot}
@@ -26,20 +32,25 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		nss_caps	libfreebl3.so libnss3.so libnssckbi.so libsmime3.so ibsoftokn3.so libssl3.so libnssutil3.so
 %define		nspr_caps	libnspr4.so libplc4.so libplds4.so
+%define		ffmpeg_caps	libffmpegsumo.so
 
 # list of script capabilities (regexps) not to be used in Provides
-%define		_noautoprov		%{nss_caps} %{nspr_caps}
+%define		_noautoprov		%{nss_caps} %{nspr_caps} %{ffmpeg_caps}
 %define		_noautoreq		%{_noautoprov}
 
 %description
 Chromium is an open-source web browser, powered by WebKit.
 
 %prep
-%setup -qc
+%ifarch %{ix86}
+%setup -qcT -a0
+%endif
+%ifarch %{x8664}
+%setup -qcT -a1
+%endif
 %{__sed} -e 's,@localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh
 
 mv chrome-linux/product_logo_48.png .
-mv chrome-linux/xdg-settings .
 mv chrome-linux/chromium-browser.1 .
 mv chrome-linux/chrome-wrapper .
 mv chrome-linux/{chrome,chromium-browser}
@@ -47,7 +58,7 @@ chmod a+x chrome-linux/lib*.so*
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/plugins,%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir},%{_libdir}/%{name}/themes}
 
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/chromium-browser
 %{__sed} -i -e 's,@libdir@,%{_libdir}/%{name},' $RPM_BUILD_ROOT%{_bindir}/chromium-browser
@@ -56,6 +67,8 @@ 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}
 
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
+
 # nspr symlinks
 for a in libnspr4.so libplc4.so libplds4.so; do
 	ln -s %{_libdir}/$a $RPM_BUILD_ROOT%{_libdir}/%{name}/$a.0d
@@ -71,8 +84,20 @@ done
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_browser_plugins
+
+%postun
+if [ "$1" = 0 ]; then
+	%update_browser_plugins
+fi
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
+
+%{_browserpluginsconfdir}/browsers.d/%{name}.*
+%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
+
 %attr(755,root,root) %{_bindir}/chromium-browser
 %{_mandir}/man1/chromium-browser.1*
 %{_pixmapsdir}/chromium-browser.png
@@ -80,22 +105,25 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/chrome.pak
 %dir %{_libdir}/%{name}/locales
+%dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/resources
 %{_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
 
 # ffmpeg libs
-%attr(755,root,root) %{_libdir}/chromium-browser-bin/libavcodec.so.52
-%attr(755,root,root) %{_libdir}/chromium-browser-bin/libavformat.so.52
-%attr(755,root,root) %{_libdir}/chromium-browser-bin/libavutil.so.50
+%attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so
 
 # nspr/nss symlinks
-%attr(755,root,root) %{_libdir}/chromium-browser-bin/libnspr4.so.0d
-%attr(755,root,root) %{_libdir}/chromium-browser-bin/libplc4.so.0d
-%attr(755,root,root) %{_libdir}/chromium-browser-bin/libplds4.so.0d
-%attr(755,root,root) %{_libdir}/chromium-browser-bin/libnss3.so.1d
-%attr(755,root,root) %{_libdir}/chromium-browser-bin/libnssutil3.so.1d
-%attr(755,root,root) %{_libdir}/chromium-browser-bin/libsmime3.so.1d
-%attr(755,root,root) %{_libdir}/chromium-browser-bin/libssl3.so.1d
+%attr(755,root,root) %{_libdir}/%{name}/libnspr4.so.0d
+%attr(755,root,root) %{_libdir}/%{name}/libplc4.so.0d
+%attr(755,root,root) %{_libdir}/%{name}/libplds4.so.0d
+%attr(755,root,root) %{_libdir}/%{name}/libnss3.so.1d
+%attr(755,root,root) %{_libdir}/%{name}/libnssutil3.so.1d
+%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