Fix x86_64 build-install

- Do not depend on sqlite, it is not being used

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4041dfc..655c15f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(SRC_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/include")
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+
 SET(INCLUDEDIR "\${prefix}/${DEST_INCLUDE_DIR}")
 SET(VERSION_MAJOR 0)
 SET(VERSION "${VERSION_MAJOR}.0.1")
@@ -43,10 +43,11 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
+CONFIGURE_FILE(${PROJECT_NAME}.manifest.in ${PROJECT_NAME}.manifest @ONLY)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc")
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
-INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 FILE(GLOB HEADER_FILES ${SRC_INCLUDE_DIR}/*.h)
 INSTALL(FILES ${HEADER_FILES} DESTINATION ${DEST_INCLUDE_DIR})

diff --git a/packaging/pims-ipc.spec b/packaging/pims-ipc.spec
index bd764b5..8db0eb1 100644 (file)
--- a/packaging/pims-ipc.spec
+++ b/packaging/pims-ipc.spec
@@ -3,11 +3,8 @@ Summary:    library for PIMs IPC
 Version:    0.0.22
 Release:    1
 Group:      System/Libraries
-License:    Apache 2.0
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Requires(post): /sbin/ldconfig
-Requires(post): /usr/bin/sqlite3
-Requires(postun): /sbin/ldconfig
 
 BuildRequires: cmake
 BuildRequires: pkgconfig(glib-2.0)
@@ -21,7 +18,7 @@ library for PIMs IPC
 %package devel
 Summary:    DB library for calendar
 Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
+Requires:   %{name} = %{version}
 
 %description devel
 library for PIMs IPC (developement files)
@@ -31,17 +28,14 @@ library for PIMs IPC (developement files)
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-
-
+%cmake .
 make %{?jobs:-j%jobs}
 
 %install
 %make_install
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 

diff --git a/pims-ipc.manifest b/pims-ipc.manifest.in
similarity index 50%
rename from pims-ipc.manifest
rename to pims-ipc.manifest.in
index 44e6873..d0a5026 100644 (file)
--- a/pims-ipc.manifest
+++ b/pims-ipc.manifest.in
@@ -3,8 +3,8 @@
                <domain name="pims-ipc"/>
        </define>
        <assign>
-               <filesystem path="/usr/lib/libpims-ipc.so.1.0.1" label="_" />
-               <filesystem path="/usr/lib/libpims-ipc.so.1" label="_" />
+               <filesystem path="@LIB_INSTALL_DIR@/libpims-ipc.so.1.0.1" label="_" />
+               <filesystem path="@LIB_INSTALL_DIR@/libpims-ipc.so.1" label="_" />
        </assign>
        <request>
                <domain name="pims-ipc" />

diff --git a/pims-ipc.pc.in b/pims-ipc.pc.in
index e277e4d..7528eb1 100755 (executable)
--- a/pims-ipc.pc.in
+++ b/pims-ipc.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@/pims-ipc
 
 Name: @PROJECT_NAME@
 Description: @PROJECT_NAME@ library

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fb2513b..7442d81 100755 (executable)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -40,5 +40,5 @@ ADD_DEFINITIONS(
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} pims-ipc ${EXT_LIBS_LDFLAGS})
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})