Repackaging dialer to fix bug #TIVI-415

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

diff --git a/Makefile.am b/Makefile.am
index 7976663..c4198c8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,21 +117,18 @@ tizen/org.tizen.dialer.service
 EXTRA_DIST += \
 tizen/org.tizen.dialer.service.in
 
+desktopicondir = @with_desktopicondir@
+desktopicon_DATA = org.tizen.dialer.png
+
 %.desktop: %.desktop.in Makefile
        $(AM_V_SED)sed 's:@bindir[@]:$(bindir):g' $< > $@
 
 desktopdir = @with_desktopdir@
 desktop_DATA = \
-tizen/answer_daemon.desktop \
-tizen/dialer.desktop \
-tizen/org.tizen.call.desktop \
-tizen/org.tizen.phone.desktop
+tizen/org.tizen.dialer.desktop
 
 EXTRA_DIST += \
-tizen/answer_daemon.desktop.in \
-tizen/dialer.desktop.in \
-tizen/org.tizen.call.desktop.in \
-tizen/org.tizen.phone.desktop.in
+tizen/org.tizen.dialer.desktop.in
 
 
 tizen/order: tizen/order.in Makefile

diff --git a/configure.ac b/configure.ac
index c1b6f1b..d21cb8b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,12 @@ AC_ARG_WITH(dbusservicesdir,
    [with_dbusservicesdir="${withval}"], [:])
 AC_SUBST(with_dbusservicesdir)
 
+with_desktopicondir="/usr/share/icons/default/small"
+AC_ARG_WITH(desktopicondir,
+   [AC_HELP_STRING([--with-desktopicondir=PATH],
+      [Where to place desktop icon file. Default=/usr/share/icons/default/small/])],
+   [with_desktopicondir="${withval}"], [:])
+AC_SUBST(with_desktopicondir)
 
 with_desktopdir="/opt/share/applications"
 AC_ARG_WITH(desktopdir,
@@ -88,6 +94,12 @@ AC_ARG_WITH(desktopdir,
    [with_desktopdir="${withval}"], [:])
 AC_SUBST(with_desktopdir)
 
+eval "eval BIN_DIR=$bindir"
+AC_SUBST(BIN_DIR)
+
+eval "eval DATA_DIR=$datadir"
+AC_SUBST(DATA_DIR)
+
 AC_CONFIG_FILES([
 Makefile
 ])

diff --git a/packaging/lemolo.spec b/packaging/lemolo.spec
index b6a4306..4161b71 100644 (file)
--- a/packaging/lemolo.spec
+++ b/packaging/lemolo.spec
@@ -34,7 +34,9 @@ handsfree profile over bluetooth.
 
 %build
 
-%autogen --enable-tizen
+%autogen --enable-tizen \
+         --bindir=/opt/apps/org.tizen.dialer/bin/ \
+         --datadir=/opt/apps/org.tizen.dialer/data/ 
 
 make %{?jobs:-j%jobs}
 
@@ -44,19 +46,20 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/answer_daemon
-%{_bindir}/dialer
-%{_bindir}/messages
-%{_bindir}/dialer_daemon
-%{_bindir}/dialer_open
-%{_bindir}/message_daemon
-%{_datadir}/lemolo/examples/contacts.csv
-%{_datadir}/lemolo/scripts/ofono-efl-contacts-db-create.py
-%{_datadir}/lemolo/themes/default-sd.edj
-%{_datadir}/lemolo/themes/default.edj
+/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
+%{_datadir}/icons/default/small/org.tizen.dialer.png
 %{_datadir}/dbus-1/services/org.tizen.dialer.service
-%{_datadir}/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.phone.desktop

diff --git a/tizen/org.tizen.phone.desktop.in b/tizen/org.tizen.dialer.desktop.in
similarity index 79%
rename from tizen/org.tizen.phone.desktop.in
rename to tizen/org.tizen.dialer.desktop.in
index de0ea9f..a10fb14 100644 (file)
--- a/tizen/org.tizen.phone.desktop.in
+++ b/tizen/org.tizen.dialer.desktop.in
@@ -1,6 +1,6 @@
-Name=Phone
+Name=Dialer
 Exec=@bindir@/dialer
-Icon=org.tizen.phone.png
+Icon=org.tizen.dialer.png
 Type=Application
 MimeType=
 Nodisplay=False