packaging: updated spec file, added config and systemd service files.

Change-Id: Ibf1b08df6f56d4234aa04e1c08ba745927a664e1

diff --git a/packaging/speech-recognition.changes b/packaging/speech-recognition.changes
new file mode 100644 (file)
index 0000000..c35cb66
--- /dev/null
+++ b/packaging/speech-recognition.changes
@@ -0,0 +1,2 @@
+* Thu Aug 22 10:20:28 EEST 2013 Krisztian Litkey <krisztian.litkey@intel.com> - 0.0.1
+- Initial packaging/release for Tizen IVI.

diff --git a/packaging/speech-recognition.conf b/packaging/speech-recognition.conf
new file mode 100644 (file)
index 0000000..19d702a
--- /dev/null
+++ b/packaging/speech-recognition.conf
@@ -0,0 +1,12 @@
+# default mike input
+sphinx.pulsesrc = alsa_input.usb-Logitech_Logitech_USB_Microphone-00-Microphone.analog-mono
+# language models and dictionaries
+sphinx.hmm  = /usr/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k
+sphinx.lm   = /usr/share/speech-recognition/dictionaries/demo/demo.DMP
+sphinx.dict = /usr/share/speech-recognition/dictionaries/demo/demo.dic
+sphinx.fsg  = /usr/share/speech-recognition/dictionaries/demo/demo.fsg
+sphinx.decoder      = general
+sphinx.general.lm   = /usr/share/pocketsphinx/model/lm/en_US/wsj0vp.5000.DMP
+sphinx.general.dict = /usr/share/pocketsphinx/model/lm/en_US/cmu07a.dic
+# search plugin command
+search.command = /usr/bin/MiniBrowser "http://google.com/search?q=__url__"

diff --git a/packaging/speech-recognition.env b/packaging/speech-recognition.env
new file mode 100644 (file)
index 0000000..59fd4cb
--- /dev/null
+++ b/packaging/speech-recognition.env
@@ -0,0 +1,11 @@
+# PulseAudio source to use for the mike
+MIKE="-s sphinx.pulsesrc=alsa_input.usb-Logitech_Logitech_USB_Microphone-00-Microphone.analog-mono"
+
+# built-in clients to load
+CLIENTS="-s gmainloop=true -L wrt-media-client"
+
+# plugins to load
+PLUGINS="-L simple-disambiguator -L sphinx-speech"
+
+# basic configuration file
+CONFIG="-c /etc/speech-recognition/speech-recognition.conf -P /usr/lib/srs/plugins"

diff --git a/packaging/speech-recognition.service b/packaging/speech-recognition.service
new file mode 100644 (file)
index 0000000..5d0a79d
--- /dev/null
+++ b/packaging/speech-recognition.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Speech recognition service
+After=sound.target
+
+[Service]
+EnvironmentFile=/etc/sysconfig/speech-recognition
+ExecStart=/usr/sbin/srs-daemon -f $CONFIG $MIKE $PLUGINS $CLIENTS
+Type=simple
+
+[Install]
+WantedBy=tizen-middleware.target

diff --git a/packaging/speech-recognition.spec b/packaging/speech-recognition.spec
index 85c5b34..1d6187a 100644 (file)
--- a/packaging/speech-recognition.spec
+++ b/packaging/speech-recognition.spec
@@ -1,54 +1,84 @@
-Summary: Speech recognition for Tizen
+Summary: Speech recognition service for Tizen
 Name: speech-recognition
-Version:  0.0.1
+Version: 0.0.1
 Release: 0
-License: LGPLv2.1
-Group: System Environment/Daemons
+License: BSD-3-Clause
+Group: Base/Utilities
 URL: https://github.com/otcshare/speech-recognition
 Source0: %{name}-%{version}.tar.gz
-#BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires: pkgconfig(pocketsphinx)
 BuildRequires: pkgconfig(sphinxbase)
 BuildRequires: pkgconfig(libpulse)
 BuildRequires: pkgconfig(murphy-common)
 BuildRequires: pkgconfig(murphy-pulse)
+BuildRequires: pkgconfig(murphy-glib)
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(libudev)
 BuildRequires: pkgconfig(json)
+
 Requires: pulseaudio
+Requires: sphinxbase
+Requires: pocketsphinx
 
 %description
-This package contains a pulseaudio module that enforces (mostly audio) routing,
-corking and muting policy decisions.
+SRS/Winthorpe speech recognition system service.
+
+%package doc
+Summary: Documentation
+Group: Development/Tools
+
+%description doc
+Documentation for the speech recognition service.
 
 %prep
 %setup -q -n %{name}-%{version}
 
 %build
-./bootstrap --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib \
-    --enable-gpl --enable-dbus --enable-sphinx
-
-make
+./bootstrap && \
+    %configure --disable-gpl --disable-dbus \
+        --enable-sphinx --enable-wrt-client && \
+    make
 
 %install
-rm -rf %{buildroot}
+rm -fr $RPM_BUILD_ROOT
+
 %make_install
 
-mkdir -p %{buildroot}/usr/share/srs
-cp run-speech-daemon.sh %{buildroot}/usr/share/srs
-cp speech-recognition.conf %{buildroot}/usr/share/srs
-cp demo/dictionary/demo.* %{buildroot}/usr/share/srs
+# Install dictionaries, configuration and service files.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+    $RPM_BUILD_ROOT/lib/systemd/user \
+    $RPM_BUILD_ROOT%{_sysconfdir}/speech-recognition \
+    $RPM_BUILD_ROOT%{_datadir}/speech-recognition/dictionaries/demo
 
+/usr/bin/install -m 644 packaging/speech-recognition.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/speech-recognition
+/usr/bin/install -m 644 packaging/speech-recognition.env \
+    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/speech-recognition
+/usr/bin/install -m 644 packaging/speech-recognition.service \
+    $RPM_BUILD_ROOT/lib/systemd/user
+/usr/bin/install -m 644 \
+    -t $RPM_BUILD_ROOT%{_datadir}/speech-recognition/dictionaries/demo \
+    dictionaries/demo/demo.*
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+%post
+ldconfig
+
+%postun
+ldconfig
 
 %files
 %defattr(-,root,root,-)
-/usr/bin/srs-client
-/usr/lib/src/plugins/plugin-*
-/usr/sbin/srs-daemon
-/usr/share/doc/speech-recognition/*
-/usr/share/srs/demo.*
-/usr/share/srs/speech-recognition.conf
-/usr/share/srs/run-speech-daemon.sh
+%{_sbindir}/srs-daemon
+%{_libdir}/srs
+%{_sysconfdir}/speech-recognition/speech-recognition.conf
+%{_sysconfdir}/sysconfig/speech-recognition
+%{_datadir}/speech-recognition/dictionaries
+/lib/systemd/user/speech-recognition.service
+
+%files doc
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README