fixed build on x86_64 tizen_2.1 2.1b_release accepted/tizen/20130520.100641 accepted/tizen_2.1/20130425.040706 submit/tizen/20130517.044610 submit/tizen_2.1/20130424.230249
authorAnas Nashif <anas.nashif@intel.com>
Wed, 30 Jan 2013 16:59:18 +0000 (08:59 -0800)
committerAnas Nashif <anas.nashif@intel.com>
Fri, 5 Apr 2013 22:05:30 +0000 (15:05 -0700)
Change-Id: Id102ae187b00ff35e299f25f0cfa75b8aa666b88

CMakeLists.txt
packaging/capi-telephony-call.spec

index 5f2c6d2..d7cb846 100644 (file)
@@ -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)
 
index 0768965..26785eb 100644 (file)
@@ -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