packaging: generate config file, added W3C-speech dictionary dir.

Change-Id: I4d4057474b56e16e02bb29e6077a07fb6d5b2f48

diff --git a/packaging/speech-recognition.conf b/packaging/speech-recognition.conf.in
similarity index 95%
rename from packaging/speech-recognition.conf
rename to packaging/speech-recognition.conf.in
index b2777d1..82e6b51 100644 (file)
--- a/packaging/speech-recognition.conf
+++ b/packaging/speech-recognition.conf.in
@@ -49,7 +49,7 @@ load search-client
 load native-client
 
 w3c-speech.address  = unxs:@winthorpe.w3c-speech
-w3c-speech.grammars = /etc/speech-recognition/w3c-grammars
+w3c-speech.grammars = @DATADIR@/speech-recognition/w3c-grammars
 load w3c-speech
 
 # wrt-media-client needs GMainLoop

diff --git a/packaging/speech-recognition.spec b/packaging/speech-recognition.spec
index 1cd3162..5c5b8bd 100644 (file)
--- a/packaging/speech-recognition.spec
+++ b/packaging/speech-recognition.spec
@@ -118,13 +118,11 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} \
 /usr/bin/install -m 644 packaging/speech-recognition.conf \
     $RPM_BUILD_ROOT%{_sysconfdir}/speech-recognition
 
-case %{_arch} in
-    *64) LIBDIR=/usr/lib64;;
-      *) LIBDIR=/usr/lib;;
-esac
-
+cat packaging/speech-recognition.conf.in | \
+    sed "s#@DATADIR@#%{_datadir}#g" \
+        > packaging/speech-recognition.conf
 cat packaging/speech-recognition.service.in | \
-    sed "s#@LIBDIR@#$LIBDIR#g" \
+    sed "s#@LIBDIR@#%{_libdir}#g" \
         > packaging/speech-recognition.service
 
 /usr/bin/install -m 644 packaging/speech-recognition.service \
@@ -138,10 +136,11 @@ cat packaging/speech-recognition.service.in | \
 /usr/bin/install -m 755 packaging/start-speech-service.sh \
      $RPM_BUILD_ROOT%{_libdir}/srs/scripts
 
-
 /usr/bin/install -m 755 packaging/org.tizen.srs.service \
      $RPM_BUILD_ROOT%{_datadir}/dbus-1/services
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/speech-recognition/dictionaries/w3c-speech
+
 %install_service ../user/weston.target.wants speech-recognition.socket
 
 %clean
@@ -166,6 +165,7 @@ ldconfig
 %{_sysconfdir}/speech-recognition/speech-recognition.conf
 %dir %{_sysconfdir}/speech-recognition/w3c-grammars
 %{_datadir}/speech-recognition/dictionaries
+%dir %{_datadir}/speech-recognition/w3c-speech
 %{_unitdir_user}/speech-recognition.service
 %{_unitdir_user}/speech-recognition.socket
 %{_unitdir_user}/weston.target.wants/speech-recognition.socket