Fixed build on x86_64.

Change-Id: I0839f08d0e0d1c485e3dabf673c1a1ba6e1cd47c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d59abd3..765dbb7 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ ENDIF("${ARCH}" STREQUAL "arm")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DTIZEN_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})
@@ -44,7 +44,7 @@ SET_TARGET_PROPERTIES(${fw_name}
 )
 
 
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(
         DIRECTORY ${INC_DIR}/ DESTINATION include/system
         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)
 
 #ADD_SUBDIRECTORY(test)
 

diff --git a/packaging/capi-system-power.spec b/packaging/capi-system-power.spec
index 1db870c..d09d57f 100644 (file)
--- a/packaging/capi-system-power.spec
+++ b/packaging/capi-system-power.spec
@@ -1,7 +1,6 @@
-#sbs-git:slp/api/power capi-system-power 0.1.0 0432661af455f52366bdcd809dc72a00854c763c
 Name:       capi-system-power
 Summary:    A power library in SLP C API
-Version: 0.1.1
+Version:    0.1.1
 Release:    1
 Group:      framework/system
 License:    APLv2
@@ -14,12 +13,8 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(vconf)
 
-Requires(post): /sbin/ldconfig  
-Requires(postun): /sbin/ldconfig
-
 %description
 
-
 %package devel
 Summary:  A power library in SLP C API (Development)
 Group:    TO_BE/FILLED_IN
@@ -27,22 +22,18 @@ Requires: %{name} = %{version}-%{release}
 
 %description devel
 
-
-
 %prep
 %setup -q
 
-
 %build
 cp %{SOURCE1001} .
 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