Merge from TIZEN 2.3HEADtizen

    Apply build option to tizen 3.0

Change-Id: I626b304e38ccacd457359fc8e954b747f21d6646

2 files changed, 44 insertions, 16 deletions

diff --git a/packaging/e17-extra-modules.changes b/packaging/e17-extra-modules.changes
deleted file mode 100644
index b1151f2..0000000
--- a/packaging/e17-extra-modules.changes
+++ /dev/null
@@ -1,2 +0,0 @@
-* Wed Nov 28 2012 Anas Nashif <anas.nashif@intel.com> accepted/trunk/20121113.042536@ff62a74
-- Use libX11 instead of libx11
diff --git a/packaging/e17-extra-modules.spec b/packaging/e17-extra-modules.spec
index 575603e..6c1c28a 100755
--- a/packaging/e17-extra-modules.spec
+++ b/packaging/e17-extra-modules.spec
@@ -1,11 +1,12 @@
+%bcond_with x
 Name:       e17-extra-modules
-Summary:    The E17 Extra Modules The E17 extra modules consists of modules made by SAMSUNG
-Version:    0.14.11
+Summary:    The E17 Extra Modules for Tizen
+Version:    0.10.116
 Release:    1
 Group:      System/GUI/Other
-License:    BSD
+License:    BSD-2-Clause
 Source0:    %{name}-%{version}.tar.gz
-BuildRequires:  pkgconfig(enlightenment)
+BuildRequires:  e17-devel
 BuildRequires:  pkgconfig(utilX)
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(dlog)
@@ -14,16 +15,20 @@ BuildRequires:  pkgconfig(xextproto)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(edje)
+BuildRequires:  pkgconfig(eina)
+BuildRequires:  pkgconfig(ecore)
+BuildRequires:  pkgconfig(ecore-x)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(evas)
 BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(xtst)
 BuildRequires:  pkgconfig(pixman-1)
-BuildRequires:  pkgconfig(sensor)
 BuildRequires:  pkgconfig(vconf)
+BuildRequires:  cmake
+BuildRequires:  gettext
 BuildRequires:  edje-tools
+
 Requires: libX11
-Requires: sensor
 Requires: vconf
 
 %description
@@ -32,15 +37,16 @@ The E17 Extra Modules  The E17 extra modules consists of modules made by SAMSUNG
 %prep
 %setup -q
 
-
 %build
+%define DEF_SUBDIRS illume2-tizen comp-tizen keyrouter wmready accessibility move-tizen devicemgr extndialog screen-reader
 
-%define DEF_SUBDIRS comp-tizen illume2-tizen keyrouter wmready accessibility move-tizen devicemgr extndialog screen-reader devmode-tizen
-
-export CFLAGS+=" -Wall -g -fPIC -rdynamic"
+export GC_SECTIONS_FLAGS="-fdata-sections -ffunction-sections -Wl,--gc-sections"
+export CFLAGS+=" -Wall -g -fPIC -rdynamic ${GC_SECTIONS_FLAGS} -D_F_REMAP_MOUSE_BUTTON_TO_HWKEY_ "
 export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=/usr/lib"
-# use dlog
-export CFLAGS+=" -DUSE_DLOG"
+
+export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
+
+export CFLAGS+=" -D_ENV_MOBILE_"
 
 %ifarch %{arm}
 export CFLAGS+=" -D_ENV_ARM"
@@ -49,16 +55,37 @@ export CFLAGS+=" -D_ENV_ARM"
 
 for FILE in %{DEF_SUBDIRS}
 do
+    if test "x${FILE}" = "xcomp-tizen" ; then
+        cd $FILE
+        export CFLAGS+=" -D_F_USE_GRAB_KEY_SET_"
+        %autogen
+        %configure --enable-hwc \
+                   --prefix=/usr
+        make %{?jobs:-j%jobs}
+        cd -
+    elif test "x${FILE}" = "xscreen-reader" ; then
         cd $FILE
+#        export CFLAGS+=" -DENABLE_RAPID_KEY_INPUT"
         %autogen
         %configure --prefix=/usr
-        make
+        make %{?jobs:-j%jobs}
         cd -
+    else
+        cd $FILE
+        %autogen
+        %configure --prefix=/usr
+        make %{?jobs:-j%jobs}
+        cd -
+    fi
 done
 
 %install
 rm -rf %{buildroot}
 
+# for smack rule
+mkdir -p %{buildroot}/etc/smack/accesses2.d
+cp %{_builddir}/%{buildsubdir}/e17-extra-modules.rule %{buildroot}/etc/smack/accesses2.d
+
 # for license notification
 mkdir -p %{buildroot}/usr/share/license
 cp -a %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/usr/share/license/%{name}
@@ -78,6 +105,7 @@ find  %{buildroot}/usr/lib/enlightenment/modules -name *.a | xargs rm
 %files
 %manifest e17-extra-modules.manifest
 %defattr(-,root,root,-)
+
 %{_libdir}/enlightenment/modules/comp-tizen
 %{_libdir}/enlightenment/modules/e17-extra-module-accessibility
 %{_libdir}/enlightenment/modules/illume2-tizen
@@ -86,8 +114,10 @@ find  %{buildroot}/usr/lib/enlightenment/modules -name *.a | xargs rm
 %{_libdir}/enlightenment/modules/move-tizen
 %{_libdir}/enlightenment/modules/e17-extra-module-devicemgr
 %{_libdir}/enlightenment/modules/screen-reader
-%{_libdir}/enlightenment/modules/devmode-tizen
 %{_datadir}/enlightenment/data/*
 %{_bindir}/extndialog
 %{_bindir}/*
 /usr/share/license/%{name}
+/etc/smack/accesses2.d/e17-extra-modules.rule
+
+%define _unpackaged_files_terminate_build 0