X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fozone%2Fpackaging%2Frpm%2Fchromium.spec;h=471c6761145e86501941c35f21b3a1f4a2ffe2ff;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=384b624c76ea040a9318290cc8159037b1f9eccd;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/ozone/packaging/rpm/chromium.spec b/src/ozone/packaging/rpm/chromium.spec index 384b624..471c676 100644 --- a/src/ozone/packaging/rpm/chromium.spec +++ b/src/ozone/packaging/rpm/chromium.spec @@ -1,12 +1,13 @@ Name: chromium -Version: 35.0.1906.0 +Version: 39.0.2149.0 Release: 0 Summary: Chromium ozone-wayland License: BSD-3-Clause Group: Web Framework/chromium Url: https://01.org/ozone-wayland Source: %{name}.tar -Source1: chromium-browser.sh +Source1: chromium-browser-ia32.sh +Source2: chromium-browser-x64.sh Source1001: chromium.manifest BuildRequires: bison @@ -35,6 +36,7 @@ BuildRequires: pkgconfig(haptic) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(libssl) BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libudev) @@ -72,6 +74,12 @@ cp -a src/ozone/LICENSE LICENSE.ozone-wayland # CFLAGS end up appending -fno-omit-frame-pointer. See http://crbug.com/37246 export CFLAGS=`echo $CFLAGS | sed s,-fno-omit-frame-pointer,,g` +%ifarch %{ix86} +# Remove debug symbols +export CFLAGS=`echo $CFLAGS | sed s,-g,,g` +export CXXFLAGS=`echo $CXXFLAGS | sed s,-g,,g` +%endif + # Building the RPM in the GBS chroot fails with errors such as # /usr/lib/gcc/i586-tizen-linux/4.7/../../../../i586-tizen-linux/bin/ld: # failed to set dynamic section sizes: Memory exhausted @@ -129,14 +137,19 @@ export GYP_GENERATORS=ninja -Duse_system_nspr=1 \ -Denable_xi21_mt=1 \ -Duse_xi2_mt=0 \ +%ifarch x86_64 +-Dtarget_arch=x64 \ +%else -Dtarget_arch=ia32 \ +%endif -Duse_alsa=0 \ -Duse_gnome_keyring=0 \ -Dlogging_like_official_build=1 \ -Dtracing_like_official_build=1 \ -Drelease_unwind_tables=0 \ -Dlinux_dump_symbols=0 \ --Denable_ozone_wayland_vkb=1 +-Denable_ozone_wayland_vkb=1 \ +-Dclang=0 ninja %{?_smp_mflags} -C out/Release chrome @@ -161,7 +174,11 @@ fi cd src # Binaries. +%ifarch x86_64 +install -p -D %{SOURCE2} %{buildroot}%{_bindir}/chromium-browser +%else install -p -D %{SOURCE1} %{buildroot}%{_bindir}/chromium-browser +%endif install -p -D ${BUILDDIR_NAME}/out/Release/chrome %{buildroot}%{_libdir}/chromium/chrome cp -R ${BUILDDIR_NAME}/out/Release/locales %{buildroot}%{_libdir}/chromium/