fixed build on x86_64

Change-Id: Ie82d47ed5c68cb663877542a8ffceb4801821f8c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a1b4da..8d863ba 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,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})
@@ -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/capi-telephony-network-info.pc.in b/capi-telephony-network-info.pc.in
index 8731238..423e13f 100644 (file)
--- a/capi-telephony-network-info.pc.in
+++ b/capi-telephony-network-info.pc.in
@@ -1,9 +1,8 @@
-
 # Package Information for pkg-config
 
 prefix=@PREFIX@
 exec_prefix=/usr
-libdir=/usr/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=/usr/include/telephony
 
 Name: @PC_NAME@

diff --git a/packaging/capi-telephony-network-info.spec b/packaging/capi-telephony-network-info.spec
index fa6c903..a1197ce 100644 (file)
--- a/packaging/capi-telephony-network-info.spec
+++ b/packaging/capi-telephony-network-info.spec
@@ -2,26 +2,26 @@ Name:       capi-telephony-network-info
 Summary:    A Telephony Network Information library in Tizen Native API
 Version: 0.1.0
 Release:    11
-Group:      TO_BE/FILLED_IN
-License:    TO BE FILLED IN
+Group:      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
+A Telephony Network Information library in Tizen Native API.
 
 
 %package devel
 Summary:  A Telephony Network Information library in Tizen Native API (Development)
-Group:    TO_BE/FILLED_IN
+Group:    C API
 Requires: %{name} = %{version}-%{release}
 
 %description devel
+A Telephony Network Information library in Tizen Native API.
 
 
 
@@ -31,7 +31,7 @@ Requires: %{name} = %{version}-%{release}
 
 %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}