From 540f170f953ef5a09a19a66337d49eef759014ea Mon Sep 17 00:00:00 2001 From: Jiwoong Im Date: Thu, 2 Jul 2015 17:05:13 +0900 Subject: [PATCH] Revert "Fixed the spec file to change the build according to graphic engine" This reverts commit f4fe14c37b8d6b42d462997f341be15848a7bbb4. Change-Id: Ifcaba63f81873d9945928d79517ffbefa03759a2 Signed-off-by: Jiwoong Im --- CMakeLists.txt | 4 ---- packaging/org.tizen.settings-tv-ref.spec | 14 +++++--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01a6284..6e3f1f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(settings-tv-ref) -IF (with_wayland) - ADD_DEFINITIONS("-DWAYLAND") -ENDIF (with_wayland) - INCLUDE(FindPkgConfig) pkg_check_modules(HOMEPANEL_PKGS REQUIRED application-common diff --git a/packaging/org.tizen.settings-tv-ref.spec b/packaging/org.tizen.settings-tv-ref.spec index f82326c..9c52c29 100644 --- a/packaging/org.tizen.settings-tv-ref.spec +++ b/packaging/org.tizen.settings-tv-ref.spec @@ -1,6 +1,3 @@ -%bcond_with x -%bcond_with wayland - Name: org.tizen.settings-tv-ref Summary: Setting Reference Application Version: 0.2 @@ -47,6 +44,10 @@ BuildRequires: vconf %define _ugedjedir /usr/ug/res/edje %define _jsonhelperfile %{_jsonoutputdir}/helper.json +%if "%{?_with_wayland}" == "1" +ExcludeArch: armv7l i586 i686 x86_64 aarch64 +%endif + %description Description: settings-tv-ref application @@ -69,12 +70,7 @@ cmake . \ -DDESKTOP_ICONDIR=%{_desktop_icondir} \ -DDESKTOP_ICON=%{name}.png \ -DDESKTOP_ICON_4X2=%{name}_4x2.png \ - -DJSONHELPERFILE=%{_jsonhelperfile} \ - %if %{with wayland} && !%{with x} - -Dwith_wayland=TRUE - %else - -Dwith_x=TRUE - %endif + -DJSONHELPERFILE=%{_jsonhelperfile} make %{?jobs:-j%jobs} %install -- 2.7.4