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

diff --git a/chromium-browser-bin.spec b/chromium-browser-bin.spec
index 0e99e08..884b4f8 100644
--- a/chromium-browser-bin.spec
+++ b/chromium-browser-bin.spec
@@ -1,17 +1,20 @@
-%define		svnver  32507
-%define		rel		0.1
+%define		svnrev	32603
+%define		rel		1
 Summary:	A WebKit powered web browser
 Name:		chromium-browser-bin
-Version:	4.0.253.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:	bc8f6ac27ca2eb92ecb34703b205217c
-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
@@ -19,7 +22,7 @@ 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}
@@ -29,7 +32,7 @@ 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	libavcodec.so libavformat.so libavutil.so
+%define		ffmpeg_caps	libffmpegsumo.so
 
 # list of script capabilities (regexps) not to be used in Provides
 %define		_noautoprov		%{nss_caps} %{nspr_caps} %{ffmpeg_caps}
@@ -39,7 +42,12 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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 .
@@ -50,7 +58,7 @@ chmod a+x chrome-linux/lib*.so*
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/plugins,%{_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
@@ -99,7 +107,7 @@ fi
 %dir %{_libdir}/%{name}/locales
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/resources
-#%{_libdir}/%{name}/themes
+%{_libdir}/%{name}/themes
 %attr(755,root,root) %{_libdir}/%{name}/chromium-browser
 
 # These unique permissions are intentional and necessary for the sandboxing
@@ -107,9 +115,6 @@ fi
 
 # ffmpeg libs
 %attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so
-#%attr(755,root,root) %{_libdir}/%{name}/libavcodec.so.52
-#%attr(755,root,root) %{_libdir}/%{name}/libavformat.so.52
-#%attr(755,root,root) %{_libdir}/%{name}/libavutil.so.50
 
 # nspr/nss symlinks
 %attr(755,root,root) %{_libdir}/%{name}/libnspr4.so.0d