Fixed packaging

Added org.tizen.dialer.xml to generate the .desktop file,
and changed the install directory to /usr instead of /opt

Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>

diff --git a/Makefile.am b/Makefile.am
index c4198c8..a5037a9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,9 +123,15 @@ desktopicon_DATA = org.tizen.dialer.png
 %.desktop: %.desktop.in Makefile
        $(AM_V_SED)sed 's:@bindir[@]:$(bindir):g' $< > $@
 
+if HAVE_TIZEN
+desktopdir = /usr/share/packages
+desktop_DATA = \
+org.tizen.dialer.xml
+else
 desktopdir = @with_desktopdir@
 desktop_DATA = \
 tizen/org.tizen.dialer.desktop
+endif
 
 EXTRA_DIST += \
 tizen/org.tizen.dialer.desktop.in

diff --git a/configure.ac b/configure.ac
index 4a93a93..706edf4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -86,10 +86,10 @@ AC_ARG_WITH(desktopicondir,
    [with_desktopicondir="${withval}"], [:])
 AC_SUBST(with_desktopicondir)
 
-with_desktopdir="/opt/share/applications"
+with_desktopdir="/usr/share/applications"
 AC_ARG_WITH(desktopdir,
    [AC_HELP_STRING([--with-desktopdir=PATH],
-      [Where to place desktop files. Default=/opt/share/applications/])],
+      [Where to place desktop files. Default=/usr/share/applications/])],
    [with_desktopdir="${withval}"], [:])
 AC_SUBST(with_desktopdir)
 

diff --git a/org.tizen.dialer.xml b/org.tizen.dialer.xml
new file mode 100755 (executable)
index 0000000..a3427f6
--- /dev/null
+++ b/org.tizen.dialer.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.dialer" version="0.1.1" install-location="internal-only">
+       <label>Dialer</label>
+       <description>Handsfree Dialer Application</description>
+       <ui-application appid="org.tizen.dialer" exec="/usr/apps/org.tizen.dialer/bin/dialer" nodisplay="false" multiple="false" type="capp" taskmanage="true">
+               <icon>org.tizen.dialer.png</icon>
+               <label>Dialer</label>
+               <label xml:lang="en-gb">Dialer</label>
+               <label xml:lang="en-us">Dialer</label>
+
+       </ui-application>
+</manifest>

diff --git a/packaging/lemolo.spec b/packaging/lemolo.spec
index f620d99..c5dd784 100644 (file)
--- a/packaging/lemolo.spec
+++ b/packaging/lemolo.spec
@@ -34,8 +34,8 @@ handsfree profile over bluetooth.
 %build
 
 %autogen --enable-tizen \
-         --bindir=/opt/apps/org.tizen.dialer/bin/ \
-         --datadir=/opt/apps/org.tizen.dialer/data/ 
+         --bindir=/usr/apps/org.tizen.dialer/bin/ \
+         --datadir=/usr/apps/org.tizen.dialer/data/ 
 
 make %{?jobs:-j%jobs}
 
@@ -45,20 +45,17 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-/opt/apps/org.tizen.dialer/bin/answer_daemon
-/opt/apps/org.tizen.dialer/bin/dialer
-/opt/apps/org.tizen.dialer/bin/messages
-/opt/apps/org.tizen.dialer/bin/dialer_daemon
-/opt/apps/org.tizen.dialer/bin/dialer_open
-/opt/apps/org.tizen.dialer/bin/message_daemon
-/opt/apps/org.tizen.dialer/data/lemolo/examples/contacts.csv
-/opt/apps/org.tizen.dialer/data/lemolo/scripts/ofono-efl-contacts-db-create.py
-/opt/apps/org.tizen.dialer/data/lemolo/themes/default-sd.edj
-/opt/apps/org.tizen.dialer/data/lemolo/themes/default.edj
-/opt/apps/org.tizen.dialer/data/lemolo/tizen-examples/order
-#/opt/share/applications/answer_daemon.desktop
-#/opt/share/applications/dialer.desktop
-#/opt/share/applications/org.tizen.call.desktop
-/opt/share/applications/org.tizen.dialer.desktop
+/usr/apps/org.tizen.dialer/bin/answer_daemon
+/usr/apps/org.tizen.dialer/bin/dialer
+/usr/apps/org.tizen.dialer/bin/messages
+/usr/apps/org.tizen.dialer/bin/dialer_daemon
+/usr/apps/org.tizen.dialer/bin/dialer_open
+/usr/apps/org.tizen.dialer/bin/message_daemon
+/usr/apps/org.tizen.dialer/data/lemolo/examples/contacts.csv
+/usr/apps/org.tizen.dialer/data/lemolo/scripts/ofono-efl-contacts-db-create.py
+/usr/apps/org.tizen.dialer/data/lemolo/themes/default-sd.edj
+/usr/apps/org.tizen.dialer/data/lemolo/themes/default.edj
+/usr/apps/org.tizen.dialer/data/lemolo/tizen-examples/order
+/usr/share/packages/org.tizen.dialer.xml
 %{_datadir}/icons/default/small/org.tizen.dialer.png
 %{_datadir}/dbus-1/services/org.tizen.dialer.service