Fixed build and remove hardcoding of libdir

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0252b32..91b5fe6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ SET_TARGET_PROPERTIES(${fw_name}
 
 TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
 
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(
         DIRECTORY ${INC_DIR}/ DESTINATION include/location
         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)
 
 ADD_SUBDIRECTORY(test)
 

diff --git a/capi-location-route.pc.in b/capi-location-route.pc.in
index a1d469a..d85f42f 100644 (file)
--- a/capi-location-route.pc.in
+++ b/capi-location-route.pc.in
@@ -2,7 +2,7 @@
 
 prefix=@PREFIX@
 exec_prefix=/usr
-libdir=/usr/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=/usr/include/location
 
 Name: @PC_NAME@

diff --git a/packaging/capi-location-route.changes b/packaging/capi-location-route.changes
new file mode 100644 (file)
index 0000000..cbcc995
--- /dev/null
+++ b/packaging/capi-location-route.changes
@@ -0,0 +1,3 @@
+* Wed May 29 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130520.100820@892064f
+- Fixed build and remove hardcoding of libdir
+

diff --git a/packaging/capi-location-route.spec b/packaging/capi-location-route.spec
index 60bf093..b581b42 100755 (executable)
--- a/packaging/capi-location-route.spec
+++ b/packaging/capi-location-route.spec
@@ -1,42 +1,42 @@
-Name:       capi-location-route
-Summary:    A Location Route library in Tizen Native API
-Version:    0.1.4
-Release:    1
-Group:      System/Libraries
-License:    Apache Licensc, Version 2.0
-Source0:    %{name}-%{version}.tar.gz
-BuildRequires: cmake
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(location)
-BuildRequires: pkgconfig(capi-base-common)
-BuildRequires: pkgconfig(capi-location-manager)
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Name:           capi-location-route
+Version:        0.1.4
+Release:        1
+License:        Apache-2.0
+Summary:        A Location Route library in Tizen Native API
+Group:          API/C API
+Source0:        %{name}-%{version}.tar.gz
+BuildRequires:  cmake
+BuildRequires:  pkgconfig(capi-base-common)
+BuildRequires:  pkgconfig(capi-location-manager)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(location)
 
 %description
+%{summary}.
 
 
 %package devel
-Summary:  A Location Route library in Tizen Native API (Development)
-Group:    TO_BE/FILLED_IN
-Requires: %{name} = %{version}-%{release}
+Summary:        A Location Route library in Tizen Native API (Development)
+Group:          Development/API
+Requires:       %{name} = %{version}
 
 %description devel
+%{summary}.
+
+Development Package
 
 
 %prep
 %setup -q
 
-
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
 
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
 %post -p /sbin/ldconfig