Fix x86_64 build and install

- Fixed package groups
- Cleanup spec

Change-Id: Ibc836a4b6bcbe0b8ac697e010c8cb2556edf4adc
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61d858d4208061ea0e193ce2f08c23821a031418..003fb77fe83e1b2ab5dd13ddc38f8aeaf8326d51 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ ENDIF("${ARCH}" STREQUAL "arm")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_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})
@@ -43,7 +43,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/appfw
         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)
 
 IF(UNIX)
 

diff --git a/capi-appfw-app-manager.pc.in b/capi-appfw-app-manager.pc.in
index f0c4fb4309867a5ca5df96f802861f53d4c1f3ed..d0ff7f2751d0989c0576933b1fe56c1d37a88989 100755 (executable)
--- a/capi-appfw-app-manager.pc.in
+++ b/capi-appfw-app-manager.pc.in
@@ -3,8 +3,8 @@
 
 prefix=@PREFIX@
 exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include/appfw
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@/appfw
 
 Name: @PC_NAME@
 Description: @PACKAGE_DESCRIPTION@

diff --git a/packaging/capi-appfw-app-manager.spec b/packaging/capi-appfw-app-manager.spec
index f586b40da532f6254d569f0b0d36dc470d9b842b..b18b839d0a2e1a941898e1b9af644ba06d5fa740 100755 (executable)
--- a/packaging/capi-appfw-app-manager.spec
+++ b/packaging/capi-appfw-app-manager.spec
@@ -1,10 +1,9 @@
-#sbs-git:slp/api/app-manager capi-appfw-app-manager 0.1.0 76739af2bfbeb46dc9db0cb3e044f880ddcb9440
 Name:       capi-appfw-app-manager
 Summary:    Application Manager API
-Version: 0.1.0
+Version:    0.1.0
 Release:    20
-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)
@@ -15,15 +14,13 @@ BuildRequires:  pkgconfig(pkgmgr)
 BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(glib-2.0)
-Requires(post): /sbin/ldconfig  
-Requires(postun): /sbin/ldconfig
 
 %description
 The Application Manager API provides functions to get information about running applications.
 
 %package devel
 Summary:  Application Manager API (Development)
-Group:    TO_BE/FILLED_IN
+Group:    Development/API
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -36,7 +33,7 @@ The Application Manager API provides functions to get information about running
 
 %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}