make it build on x86_64 tizen_2.1 2.1b_release 2.2_release accepted/tizen_2.1/20130425.035655 submit/tizen_2.1/20130424.230438 submit/tizen_2.2/20130714.135111 submit/tizen_2.2/20130714.143818
authorAnas Nashif <anas.nashif@intel.com>
Wed, 30 Jan 2013 13:33:42 +0000 (05:33 -0800)
committerJunfeng Dong <junfeng.dong@intel.com>
Thu, 11 Apr 2013 08:32:04 +0000 (16:32 +0800)
Change-Id: Id2db4d8767cc7a6628359eebfb93bb0c4e78615c

CMakeLists.txt
capi-content-mime-type.pc.in
packaging/capi-content-mime-type.spec

index f1198f0..20e016e 100755 (executable)
@@ -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/content
         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)
 
index 640d431..a419cc0 100755 (executable)
@@ -3,7 +3,7 @@
 
 prefix=@PREFIX@
 exec_prefix=/usr
-libdir=/usr/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=/usr/include/content
 
 Name: @PC_NAME@
index dc51c74..3d3ae40 100755 (executable)
@@ -2,22 +2,20 @@ Name:       capi-content-mime-type
 Summary:    A MIME type library in Tizen C API
 Version:    0.0.2
 Release:    2
-Group:      TO_BE/FILLED_IN
-License:    TO BE FILLED IN
+Group:      APIs
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(xdgmime)
-Requires(post): /sbin/ldconfig  
-Requires(postun): /sbin/ldconfig
 
 %description
 
 
 %package devel
 Summary:  A MIME type library in Tizen C API (Development)
-Group:    TO_BE/FILLED_IN
+Group:    APIs
 Requires: %{name} = %{version}-%{release}
 Requires:  pkgconfig(capi-base-common)
 
@@ -30,7 +28,7 @@ Requires:  pkgconfig(capi-base-common)
 
 %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}