From dd958d1ae9da8437ca8ab85be979c1ff644cc64f Mon Sep 17 00:00:00 2001
From: =?utf8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
Date: Thu, 12 Jun 2014 16:08:19 +0200
Subject: [PATCH] Update spec files
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* crosswalk.spec
* xdgmime.spec

Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
---
 .../crosswalk/packaging/crosswalk.spec             | 33 ++++++++++++++--------
 .../xdgmime/packaging/xdgmime.spec                 |  9 +++---
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec b/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
index 22f4d90..b9d37f5 100644
--- a/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
@@ -1,12 +1,15 @@
 %bcond_with x
 %bcond_with wayland
 
-
+# NaCl build on 64bit system require libc 32bit to build the 32 IRT.
+# While Tizen 64bit image does not offer 32bit packages at all,
+# check https://bugs.tizen.org/jira/browse/PTREL-803 for details.
+# So disable nacl for 64bit now.
 %define _disable_nacl 1
 
 
 Name:           crosswalk
-Version:        7.35.139.0
+Version:        7.36.151.0
 Release:        0
 Summary:        Crosswalk is an app runtime based on Chromium
 License:        (BSD-3-Clause and LGPL-2.1+)
@@ -19,14 +22,15 @@ Source3:        xwalk.service.in
 Source1001:     crosswalk.manifest
 Source1002:     %{name}.xml.in
 Source1003:     %{name}.png
-Patch1:         %{name}-do-not-look-for-gtk2-when-using-aura.patch
 Patch9:         Blink-Add-GCC-flag-Wno-narrowing-fix-64bits-build.patch
+Patch10:        crosswalk-do-not-look-for-gtk-dependencies-on-x11.patch
 
 BuildRequires:  bison
 BuildRequires:  bzip2-devel
 BuildRequires:  elfutils
 BuildRequires:  expat-devel
 BuildRequires:  flex
+BuildRequires:  binutils-gold
 BuildRequires:  gperf
 BuildRequires:  libcap-devel
 BuildRequires:  libelf-devel
@@ -85,11 +89,6 @@ BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(scim)
 %endif
 
-# disable build for X11 as scim (isf) doesn't build
-%if !%{with wayland}
-ExclusiveArch:
-%endif
-
 %description
 Crosswalk is an app runtime based on Chromium. It is an open source project started by the Intel Open Source Technology Center (http://www.01.org).
 
@@ -116,9 +115,13 @@ cp -a src/AUTHORS AUTHORS.chromium
 cp -a src/LICENSE LICENSE.chromium
 cp -a src/xwalk/LICENSE LICENSE.xwalk
 
-%patch1
 %patch9
 
+# The profiles using Wayland (and thus Ozone) do not need this patch.
+%if !%{with wayland}
+%patch10
+%endif
+
 %build
 
 # For ffmpeg on ia32. The original CFLAGS set by the gyp and config files in
@@ -158,15 +161,23 @@ fi
 GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=1"
 %endif
 
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl}"
+# Force gold binary from chroot ld.gold provided by binutils-gold
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl} -Dlinux_use_bundled_binutils=0 -Dlinux_use_bundled_gold=0 "
 
 # Linking fails in Tizen Common when fatal ld warnings are enabled. XWALK-1379.
 %if "%{profile}" == "common" || "%{profile}" == "generic"
 GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
 %endif
 
+# For building for arm in OBS, we need :
+# -> to unset sysroot value.
+# sysroot variable is automatically set for cross compilation to use arm-sysroot provided by Chromium project
+# sysroot usage is not needed, we need to use arm libraries from the virtualized environment.
+#
+# Crosswalk build fails if the fpu selected in the gcc option is different from neon in case of arm7 compilation
+# So force it.
 %ifarch %{arm}
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dsysroot= -Dlinux_use_gold_binary=0"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dsysroot= "
 export CFLAGS=`echo $CFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
 export CXXFLAGS=`echo $CXXFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
 export FFLAGS=`echo $FFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
diff --git a/proto-meta-Tizen_generic/specfile-initial/xdgmime/packaging/xdgmime.spec b/proto-meta-Tizen_generic/specfile-initial/xdgmime/packaging/xdgmime.spec
index da2cddd..e694b05 100644
--- a/proto-meta-Tizen_generic/specfile-initial/xdgmime/packaging/xdgmime.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/xdgmime/packaging/xdgmime.spec
@@ -1,11 +1,11 @@
 Name:           xdgmime
 Version:        0.0.12
-Release:        2
-License:        LGPLv2, AFLv2
+Release:        0
+License:        LGPL-2.0 and AFL-2.0
 Summary:        Pkg xdgmime
-Group:          TO_BE/FILLED_IN
+Group:          Applications/Other
 Source0:        xdgmime-%{version}.tar.gz
-Source1001: 	xdgmime.manifest
+Source1001:     xdgmime.manifest
 BuildRequires:  cmake
 
 %description
@@ -40,6 +40,7 @@ make %{?_smp_mflags}
 %defattr(-,root,root,-)
 %{_libdir}/libxdgmime.so.*
 %manifest xdgmime.manifest
+%license COPYING
 
 %files devel
 %manifest %{name}.manifest
-- 
2.7.4