Revert to [W-home] Fixed svace issuesubmit/tizen/20170403.093854

Change-Id: Id6f8df779475006407fc717340481bff4068dfa9

3 files changed, 16 insertions, 38 deletions

diff --git a/home/res/edje/circle/CMakeLists.txt b/home/res/edje/circle/CMakeLists.txt
index bf53f61..2f8149a 100755
--- a/home/res/edje/circle/CMakeLists.txt
+++ b/home/res/edje/circle/CMakeLists.txt
@@ -13,6 +13,4 @@ FOREACH(edc_file ${edc_files})
 ENDFOREACH(edc_file)
 
 # install edc files
-MESSAGE(${CMAKE_CURRENT_SOURCE_DIR})
-MESSAGE(${CMAKE_CURRENT_BINARY_DIR})
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION ${EDJEDIR} FILES_MATCHING PATTERN "*.edj")
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${EDJEDIR} FILES_MATCHING PATTERN "*.edj")
diff --git a/home/res/edje/rectangle/CMakeLists.txt b/home/res/edje/rectangle/CMakeLists.txt
index 1ea0f34..2f8149a 100755
--- a/home/res/edje/rectangle/CMakeLists.txt
+++ b/home/res/edje/rectangle/CMakeLists.txt
@@ -13,4 +13,4 @@ FOREACH(edc_file ${edc_files})
 ENDFOREACH(edc_file)
 
 # install edc files
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION ${EDJEDIR} FILES_MATCHING PATTERN "*.edj")
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${EDJEDIR} FILES_MATCHING PATTERN "*.edj")
diff --git a/packaging/org.tizen.w-home.spec b/packaging/org.tizen.w-home.spec
index 5bdfd02..803eaca 100755
--- a/packaging/org.tizen.w-home.spec
+++ b/packaging/org.tizen.w-home.spec
@@ -6,6 +6,10 @@ Group:	        Applications/System
 License:	Flora-1.1
 Source0:	%{name}-%{version}.tar.gz
 
+%if "%{?tizen_profile_name}"=="mobile"
+ExcludeArch: %{arm} %ix86 x86_64
+%endif
+
 BuildRequires: cmake, gettext-tools, smack, coreutils
 BuildRequires: pkgconfig(appcore-efl)
 BuildRequires: pkgconfig(badge)
@@ -58,20 +62,10 @@ BuildRequires: edje-bin
 BuildRequires: embryo-bin
 BuildRequires: gettext-devel
 BuildRequires: hash-signer
+BuildRequires: model-build-features
 
 %description
 Home for wearable devices
-Without installing %{name}-extension-circle, this supports rectangle displays only.
-To support circle displays, install %{name}-extension-circle after this.
-
-%package extension-circle
-Summary:	Circle-UI Extension for w-home
-Requires:	%{name} = %{version}-%{release}
-%description extension-circle
-Extension of home for wearable devices supporting circle displays.
-This overwrites the execution file and resources of %{name}; thus, you need to
-reinstall %{name} after unintalling this package if you want to
-keep the original behaviors of %{name} after the uninstall.
 
 %prep
 %setup -q
@@ -80,26 +74,21 @@ keep the original behaviors of %{name} after the uninstall.
 
 %build
 
+%if "%{model_build_feature_formfactor}" == "circle"
+	%define CIRCLE "circle"
+%else
+	%define CIRCLE "rectangle"
+%endif
+
 RPM_OPT=`echo $CFLAGS|sed 's/-Wp,-D_FORTIFY_SOURCE=2//'`
 export CFLAGS=$RPM_OPT
-
-mkdir -p build_circle
-pushd build_circle
-cmake .. -DCMAKE_INSTALL_PREFIX="%{PREFIX}" -DARCH=%{ARCH} -DCIRCLE=circle
-make %{?jobs:-j%jobs}
-popd
-
-cmake  -DCMAKE_INSTALL_PREFIX="%{PREFIX}" -DARCH=%{ARCH} -DCIRCLE=rectangle
+cmake  -DCMAKE_INSTALL_PREFIX="%{PREFIX}" -DARCH=%{ARCH} -DCIRCLE="%{CIRCLE}"
 make %{?jobs:-j%jobs}
 
 
 
 %install
 rm -rf %{buildroot}
-pushd build_circle
-%make_install
-mv %{buildroot}%{PREFIX}/bin/w-home %{buildroot}%{PREFIX}/bin/w-home.circle
-popd
 %make_install
 mkdir -p %{buildroot}/usr/share/license
 mkdir -p %{buildroot}/opt/usr/share/w-launcher
@@ -131,19 +120,10 @@ vconftool set -t int "memory/private/org.tizen.w-home/sensitive_move" 1 -i -g $I
 /usr/share/packages/%{name}.xml
 /usr/share/icons/default/small/%{name}*.png
 %{PREFIX}/*.xml
-%{PREFIX}/bin/w-home
+%{PREFIX}/bin/*
 %{PREFIX}/shared/*
 %{PREFIX}/res/*.xml
 %{PREFIX}/res/*.list
-%{PREFIX}/res/edje/rectangle/*
+%{PREFIX}/res/edje/*
 %{PREFIX}/res/images/*
 %{PREFIX}/res/locale/*/*/*.mo
-
-%post extension-circle
-ln -sf w-home.circle %{PREFIX}/bin/w-home
-rm -rf %{PREFIX}/res/edje/rectangle
-%preun extension-circle
-echo "To restore the original behavior of %{name} after the uninstall, you need to reinstall %{name}"
-%files extension-circle
-%{PREFIX}/bin/w-home.circle
-%{PREFIX}/res/edje/circle/*