From df51f100a230fe0f1b05e4d35343eb6ae803e702 Mon Sep 17 00:00:00 2001 From: "jc815.lee" Date: Thu, 8 Aug 2013 11:19:30 +0900 Subject: Remove unnecessary code in spec and CMakeLists [model] [binary_type] [customer] [issue#] [problem] [cause] [solution] [team] [request] [horizontal_expansion] Change-Id: Iae1f7f34344f7a25245de8836fa8b61d54b682f5 Signed-off-by: jc815.lee --- packaging/privacy-popup.spec | 8 ++------ privacy-popup/CMakeLists.txt | 27 +++------------------------ 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/packaging/privacy-popup.spec b/packaging/privacy-popup.spec index 6069a40..7cf1875 100755 --- a/packaging/privacy-popup.spec +++ b/packaging/privacy-popup.spec @@ -1,8 +1,8 @@ Name: privacy-popup Summary: privacy-popup -Version: 0.0.1 +Version: 0.0.2 Release: 0 -License: SAMSUNG +License: Apache-2.0 or Flora Source0: %{name}-%{version}.tar.gz Source1: tizenprv00.privacy-popup.manifest @@ -10,13 +10,10 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: cmake -BuildRequires: edje-tools BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(appcore-efl) -BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(pkgmgr-info) -BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(ui-gadget-1) BuildRequires: pkgconfig(bundle) BuildRequires: pkgconfig(privacy-manager-client) @@ -51,4 +48,3 @@ rm -rf %{buildroot} %defattr(-,root,root,-) /usr/bin/tizenprv00.privacy-popup /usr/share/packages/privacy-popup.xml -#/usr/share/packages/tizenprv00.privacy-popup.xml diff --git a/privacy-popup/CMakeLists.txt b/privacy-popup/CMakeLists.txt index ec7a6ae..3ed7de9 100755 --- a/privacy-popup/CMakeLists.txt +++ b/privacy-popup/CMakeLists.txt @@ -1,24 +1,21 @@ INCLUDE(FindPkgConfig) pkg_check_modules(privacy-popup_pkgs REQUIRED - #elementary - #evas ecore-x ui-gadget-1 dlog - capi-appfw-application appcore-efl privacy-manager-client + pkgmgr-info ) SET (this_target tizenprv00.privacy-popup) +SET (manifest_target privacy-popup.xml) SET(SRCS src/privacy-popup.c ) -#SET(INCLUDEDIR "\${prefix}/include") INCLUDE_DIRECTORIES(${privacy-popup_pkgs_INCLUDE_DIRS}) -#INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/inc) INCLUDE_DIRECTORIES(./inc) @@ -32,32 +29,14 @@ ENDIF("${ARCH}" STREQUAL "arm") MESSAGE("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") -ADD_DEFINITIONS("-DSLP_DEBUG") - -#SET(CMAKE_CXX_CFLAGS "${CMAKE_CXX_FLAGS} -fPIE") -#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC") -SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed") - - ADD_EXECUTABLE(${this_target} ${SRCS}) -#TARGET_LINK_LIBRARIES(${this_target} --as-needed -pie) - ADD_DEPENDENCIES(${this_target} privacy-manager-client) TARGET_LINK_LIBRARIES(${this_target} ${privacy-popup_pkgs_LDFLAGS} ${privacy-popup_pkgs_LIBRARIES}) -TARGET_LINK_LIBRARIES(${this_target} "-lpkgmgr-info") -TARGET_LINK_LIBRARIES(${this_target} "-lprivacy-manager-client" "-L../client") - - -TARGET_LINK_LIBRARIES(${this_target} - ${privacy-popup_LIBRARIES} -) - INSTALL(TARGETS ${this_target} DESTINATION /usr/bin/ ) -#INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/${this_target}.xml DESTINATION /usr/share/packages) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/privacy-popup.xml DESTINATION /usr/share/packages) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/${manifest_target} DESTINATION /usr/share/packages) -- cgit v1.2.3