Fixed build and remove hardcoding of libdir

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c99f3ec..1c5c1c7 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,8 +29,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DTIZEN_DEBUG")
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
-
 aux_source_directory(src SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
 
@@ -43,7 +41,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/media
         FILES_MATCHING
@@ -61,7 +59,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/packaging/capi-media-radio.changes b/packaging/capi-media-radio.changes
new file mode 100644 (file)
index 0000000..b9d468d
--- /dev/null
+++ b/packaging/capi-media-radio.changes
@@ -0,0 +1,3 @@
+* Wed May 29 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130520.100817@1366d92
+- Fixed build and remove hardcoding of libdir
+

diff --git a/packaging/capi-media-radio.spec b/packaging/capi-media-radio.spec
index 5584e45..8bcf147 100644 (file)
--- a/packaging/capi-media-radio.spec
+++ b/packaging/capi-media-radio.spec
@@ -1,10 +1,9 @@
-#sbs-git:slp/api/radio capi-media-radio 0.1.0 59dddd8ea3de373c44c66ce2a298ca81240305a8
 Name:       capi-media-radio
 Summary:    A Radio library in Tizen Native API
-Version: 0.1.0
+Version:    0.1.0
 Release:    10
-Group:      TO_BE_FILLED
-License:    TO_BE_FILLED
+Group:      API/C API
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(dlog)
@@ -15,43 +14,41 @@ BuildRequires:  cmake
 BuildRequires:  gettext-devel
 
 %description
-A Radio library in Tizen Native API
+A Radio library in Tizen Native API.
 
 
 %package devel 
-Summary:    A Radio library in Tizen Native API (Developement)
-Group:      TO_BE_FILLED 
+Summary:    A Radio library in Tizen Native API (Development)
+Group:      Development/API
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-A Radio library in Tizen Native API (Developement)
+A Radio library in Tizen Native API (Development).
 
 %prep
 %setup -q
 
 %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}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
-%post
 
-%postun
+%post -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %files
 %manifest capi-media-radio.manifest
 %defattr(-,root,root,-)
-/usr/lib/libcapi-media-radio.so.*
+%{_libdir}/libcapi-media-radio.so.*
 
 %files devel 
 %defattr(-,root,root,-)
 /usr/include/media/radio.h
-/usr/lib/pkgconfig/capi-media-radio.pc
-/usr/lib/libcapi-media-radio.so
+%{_libdir}/pkgconfig/capi-media-radio.pc
+%{_libdir}/libcapi-media-radio.so