From fab51a56f55b26de986553f492cb05a7676f02ca6366ee92b012d66c8c4c72f5 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 10 Dec 2011 19:42:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/network:chromium/chromium?expand=0&rev=89 --- chromium.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/chromium.spec b/chromium.spec index 3d5de7f..fdc4359 100644 --- a/chromium.spec +++ b/chromium.spec @@ -288,6 +288,7 @@ pushd src -Duse_system_v8=1 \ -Dproprietary_codecs=1 \ -Djavascript_engine=v8 \ +-Ddisable_nacl=1 \ -Dlinux_fpic=1 \ %ifnarch x86_64 -Ddisable_sse2=1 \ @@ -300,7 +301,7 @@ pushd src %endif -Drelease_extra_cflags=-fPIC -make -r %{?_smp_mflags} chrome V=1 BUILDTYPE=Release +make -r %{?_smp_mflags} chrome V=1 BUILDTYPE=Release DISABLE_NACL=1 # Build the required SUID_SANDBOX helper make -r %{?_smp_mflags} chrome_sandbox V=1 BUILDTYPE=Release @@ -340,11 +341,13 @@ cp -a chrome.1 %{buildroot}%{_mandir}/man1/chrome.1 cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium.1 %fdupes %{buildroot}%{_mandir}/man1/ +%if 0 # NaCl cp -a nacl_helper %{buildroot}%{_libdir}/chromium/ cp -a nacl_helper_bootstrap %{buildroot}%{_libdir}/chromium/ cp -a nacl_irt_*.nexe %{buildroot}%{_libdir}/chromium/ cp -a libppGoogleNaClPluginChrome.so %{buildroot}%{_libdir}/chromium/ +%endif popd mkdir -p %{buildroot}%{_datadir}/icons/ @@ -435,8 +438,10 @@ update-alternatives --auto chromium %{_libdir}/chromium/chromium-generic %{_libdir}/chromium/plugins/ %{_libdir}/chromium/locales/ +%if 0 %{_libdir}/chromium/nacl_* %{_libdir}/chromium/libppGoogleNaClPluginChrome.so +%endif %attr(755,root,root) %{_libdir}/chromium/xdg-settings %attr(755,root,root) %{_libdir}/chromium/xdg-mime %{_libdir}/chromium/*.pak