Removed hardcoding of library install path

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09f305daa6e1294b4d906996496558d07d32b99b..9d3ed37ecfdc1480ede8a2c44031a3b80b2efc98 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,5 @@ ADD_SUBDIRECTORY(client)
 ## Server daemon ##
 ADD_SUBDIRECTORY(server)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.APLv2 RENAME stt DESTINATION /usr/share/license)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/stt-server.rule DESTINATION  /opt/etc/smack/accesses.d)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/sysinfo-stt.xml DESTINATION /etc/config)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 0a15388baaa5d9b91a603c858294d9cc4392849a..659fa72d32ce3ef9f178c4868b4a8bc2027879ad 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -62,7 +62,7 @@ CONFIGURE_FILE(stt.pc.in "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc" @ONLY)
 CONFIGURE_FILE(stt-setting.pc.in "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-setting.pc" @ONLY)
 
 ## Install library files ##
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(TARGETS "${PROJECT_NAME}_setting" DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc" "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-setting.pc" DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(TARGETS "${PROJECT_NAME}_setting" DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc" "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-setting.pc" DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/stt.h ${CMAKE_CURRENT_SOURCE_DIR}/stt_setting.h DESTINATION include)

diff --git a/packaging/stt.changes b/packaging/stt.changes
new file mode 100644 (file)
index 0000000..e9060d9
--- /dev/null
+++ b/packaging/stt.changes
@@ -0,0 +1,3 @@
+* Tue Jun 04 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130517.045423@68c2e4b
+- Removed hardcoding of library install path
+

diff --git a/packaging/stt.spec b/packaging/stt.spec
index de443d3be7670158717dc3613190972bf06c59d3..ce25aaaddd04b4ca8548c37224cf64e5521462d2 100755 (executable)
--- a/packaging/stt.spec
+++ b/packaging/stt.spec
@@ -2,11 +2,9 @@ Name:       stt
 Summary:    Speech To Text client library and daemon
 Version:    0.1.41
 Release:    1
-Group:      libs
-License:    Samsung
+Group:      UI Framework/Libraries
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(ecore)
@@ -24,7 +22,7 @@ Speech To Text client library and daemon.
 
 %package devel
 Summary:    Speech To Text header files for STT development
-Group:      libdevel
+Group:      Development/UI Framework
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
@@ -32,16 +30,15 @@ Speech To Text header files for STT development.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q 
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=/usr
+%cmake . 
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
 %make_install
 
 %post -p /sbin/ldconfig
@@ -50,14 +47,14 @@ mkdir -p %{buildroot}/usr/share/license
 
 %files
 %manifest stt-server.manifest
+%license LICENSE.APLv2
 /opt/etc/smack/accesses.d/stt-server.rule
 /etc/config/sysinfo-stt.xml
 %defattr(-,root,root,-)
 %{_libdir}/libstt.so
 %{_libdir}/libstt_setting.so
-%{_libdir}/voice/stt/1.0/sttd.conf
+%{_prefix}/lib/voice/stt/1.0/sttd.conf
 %{_bindir}/stt-daemon
-/usr/share/license/*
 
 %files devel
 %defattr(-,root,root,-)