diff options
author | Anas Nashif <anas.nashif@intel.com> | 2013-03-05 14:38:57 +0100 |
---|---|---|
committer | lifang <fangx.li@intel.com> | 2013-03-29 05:41:11 +0800 |
commit | 44998b8604dda60fd54b2c94ec0800860f6773d1 (patch) | |
tree | 8f2e8eec073d427194bd48b5eca652df190d5579 | |
parent | ecb1e05676313e73e2aff89145641d46c394a8c1 (diff) | |
download | app-manager-44998b8604dda60fd54b2c94ec0800860f6773d1.tar.gz app-manager-44998b8604dda60fd54b2c94ec0800860f6773d1.tar.bz2 app-manager-44998b8604dda60fd54b2c94ec0800860f6773d1.zip |
Fix x86_64 build and installsubmit/tizen_2.1/20130424.230224accepted/tizen_2.1/20130425.0405312.1b_release
- Fixed package groups
- Cleanup spec
Change-Id: Ibc836a4b6bcbe0b8ac697e010c8cb2556edf4adc
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
-rwxr-xr-x | CMakeLists.txt | 6 | ||||
-rwxr-xr-x | capi-appfw-app-manager.pc.in | 4 | ||||
-rwxr-xr-x | packaging/capi-appfw-app-manager.spec | 13 |
3 files changed, 10 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 61d858d..003fb77 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ ENDIF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DSLP_DEBUG") -SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib") +SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}") aux_source_directory(src SOURCES) ADD_LIBRARY(${fw_name} SHARED ${SOURCES}) @@ -43,7 +43,7 @@ SET_TARGET_PROPERTIES(${fw_name} CLEAN_DIRECT_OUTPUT 1 ) -INSTALL(TARGETS ${fw_name} DESTINATION lib) +INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR}) INSTALL( DIRECTORY ${INC_DIR}/ DESTINATION include/appfw FILES_MATCHING @@ -61,7 +61,7 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc @ONLY ) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) IF(UNIX) diff --git a/capi-appfw-app-manager.pc.in b/capi-appfw-app-manager.pc.in index f0c4fb4..d0ff7f2 100755 --- a/capi-appfw-app-manager.pc.in +++ b/capi-appfw-app-manager.pc.in @@ -3,8 +3,8 @@ prefix=@PREFIX@ exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include/appfw +libdir=@LIB_INSTALL_DIR@ +includedir=@INCLUDE_INSTALL_DIR@/appfw Name: @PC_NAME@ Description: @PACKAGE_DESCRIPTION@ diff --git a/packaging/capi-appfw-app-manager.spec b/packaging/capi-appfw-app-manager.spec index f586b40..b18b839 100755 --- a/packaging/capi-appfw-app-manager.spec +++ b/packaging/capi-appfw-app-manager.spec @@ -1,10 +1,9 @@ -#sbs-git:slp/api/app-manager capi-appfw-app-manager 0.1.0 76739af2bfbeb46dc9db0cb3e044f880ddcb9440 Name: capi-appfw-app-manager Summary: Application Manager API -Version: 0.1.0 +Version: 0.1.0 Release: 20 -Group: TO_BE/FILLED_IN -License: TO BE FILLED IN +Group: API/C API +License: Apache-2.0 Source0: %{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: pkgconfig(dlog) @@ -15,15 +14,13 @@ BuildRequires: pkgconfig(pkgmgr) BuildRequires: pkgconfig(pkgmgr-info) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(glib-2.0) -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig %description The Application Manager API provides functions to get information about running applications. %package devel Summary: Application Manager API (Development) -Group: TO_BE/FILLED_IN +Group: Development/API Requires: %{name} = %{version}-%{release} %description devel @@ -36,7 +33,7 @@ The Application Manager API provides functions to get information about running %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} make %{?jobs:-j%jobs} |