diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-01-30 08:59:18 -0800 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2013-04-05 15:05:30 -0700 |
| commit | b00b0be376b59d1e4d7915ee1389e96898a95d7c (patch) | |
| tree | dc2a2e11a2f3ee7c8602a5e59e395848bee11117 | |
| parent | 898034f9fb9cf4ad243c441c85e1836ef6059343 (diff) | |
| download | call-b00b0be376b59d1e4d7915ee1389e96898a95d7c.tar.gz call-b00b0be376b59d1e4d7915ee1389e96898a95d7c.tar.bz2 call-b00b0be376b59d1e4d7915ee1389e96898a95d7c.zip | |
fixed build on x86_64submit/tizen_2.2/20130714.144207submit/tizen_2.2/20130714.135509submit/tizen_2.1/20130424.230249accepted/tizen_2.1/20130425.0407062.2_release2.1b_releasetizen_2.1
Change-Id: Id102ae187b00ff35e299f25f0cfa75b8aa666b88
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | packaging/capi-telephony-call.spec | 17 |
2 files changed, 8 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f2c6d2..d7cb846 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,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/${service} FILES_MATCHING @@ -102,7 +102,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/packaging/capi-telephony-call.spec b/packaging/capi-telephony-call.spec index 0768965..26785eb 100644 --- a/packaging/capi-telephony-call.spec +++ b/packaging/capi-telephony-call.spec @@ -1,43 +1,38 @@ -#sbs-git:slp/api/call capi-telephony-call 0.1.0 a6c4eac47227c1f733dda20278debb9bf0ec23f2 Name: capi-telephony-call Summary: Telephony Call Framework Version: 0.1.0 Release: 1 -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) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(capi-base-common) -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - %description +Telephony Call Framework. %package devel Summary: Telephony Call Framework (Development) -Group: TO_BE/FILLED_IN +Group: API/C API Requires: %{name} = %{version}-%{release} %description devel +Telephony Call Framework. %prep %setup -q - - %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} %install -rm -rf %{buildroot} %make_install %post -p /sbin/ldconfig |