Fix build errors.

  Fix hard codeing library path.
  Modify the requires from smack-utils to smack.
  Use %cmake macro for x86_64.

Signed-off-by: Junfeng Dong <junfeng.dong@intel.com>

diff --git a/bt-share/CMakeLists.txt b/bt-share/CMakeLists.txt
index 54342e2..6fa43e6 100644 (file)
--- a/bt-share/CMakeLists.txt
+++ b/bt-share/CMakeLists.txt
@@ -33,7 +33,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(BINDIR "/usr/bin")
 SET(EXEC_PREFIX "\${prefix}")
-#SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "/usr/include")
 SET(VERSION 1.0)
 

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 9bdbf69..84f0b1f 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -18,7 +18,7 @@ ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "/usr/include")
 SET(VERSION 1.0)
 
@@ -28,8 +28,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${apipkgs_LDFLAGS})
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 FOREACH(hfile ${HEADERS})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/bluetooth-share-api)

diff --git a/packaging/bluetooth-share.spec b/packaging/bluetooth-share.spec
index be1436b..7eb49e6 100644 (file)
--- a/packaging/bluetooth-share.spec
+++ b/packaging/bluetooth-share.spec
@@ -10,7 +10,7 @@ Source0:    %{name}-%{version}.tar.gz
 Requires(post): vconf
 Requires(post): coreutils
 Requires(post): sqlite
-Requires(post): smack-utils
+Requires(post): smack
 BuildRequires:  cmake
 BuildRequires:  gettext-tools
 BuildRequires:  pkgconfig(appcore-efl)
@@ -54,13 +54,12 @@ Development package for libbluetooth-share
 
 %build
 export CFLAGS+=" -fpie -fvisibility=hidden"
-export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
+export LDFLAGS+=" -Wl,--rpath=/usr/%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake .
 make
 
 %install
-rm -rf %{buildroot}
 %make_install
 mkdir -p  %{buildroot}%{_optdir}/share/bt-ftp