From 59834e86a99348b8ae587652f6fccd0e5f2bd4f1 Mon Sep 17 00:00:00 2001
From: "dc7.lim" <dc7.lim@samsung.com>
Date: Mon, 4 Jan 2016 14:14:20 +0900
Subject: [PATCH] Change system to user to use contact api

Change-Id: I4b7954dea0483fbc19ee0c8b70895fc39a87309c
---
 packaging/call-manager.spec | 12 ++++++------
 packaging/callmgr.conf      | 14 +++++++++++++-
 resource/callmgr.service    |  2 +-
 service/CMakeLists.txt      |  2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec
index dda330b..884adf0 100755
--- a/packaging/call-manager.spec
+++ b/packaging/call-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 47
+%define patchlevel 48
 %define ext_feature 0
 
 Name:           call-manager
@@ -104,8 +104,8 @@ make %{?_smp_mflags}
 
 %install
 %make_install
-mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-ln -s %{_unitdir}/callmgr.service %{buildroot}%{_unitdir}/multi-user.target.wants/callmgr.service
+mkdir -p %{buildroot}/usr/lib/systemd/user/default.target.wants
+ln -s /usr/lib/systemd/user/callmgr.service %{buildroot}/usr/lib/systemd/user/default.target.wants/callmgr.service
 mkdir -p %{buildroot}/etc/dbus-1/system.d/
 cp %{SOURCE1} %{buildroot}/etc/dbus-1/system.d/callmgr.conf
 mkdir -p %{buildroot}/usr/share/license
@@ -113,7 +113,7 @@ cp LICENSE %{buildroot}/usr/share/license/call-manager
 
 %if 0%{?enable_slient_log}
 mkdir -p %{buildroot}/opt/usr/data/call/
-ln -s %{_unitdir}/call-logger.service %{buildroot}%{_unitdir}/multi-user.target.wants/call-logger.service
+ln -s /usr/lib/systemd/user/call-logger.service %{buildroot}/usr/lib/systemd/user/default.target.wants/call-logger.service
 %endif
 
 %files
@@ -121,8 +121,8 @@ ln -s %{_unitdir}/call-logger.service %{buildroot}%{_unitdir}/multi-user.target.
 %defattr(644,system,system,-)
 %attr(755,system,system) %{_bindir}/callmgrd
 #/etc/*
-%{_unitdir}/callmgr.service
-%{_unitdir}/multi-user.target.wants/callmgr.service
+/usr/lib/systemd/user/callmgr.service
+/usr/lib/systemd/user/default.target.wants/callmgr.service
 /etc/dbus-1/system.d/callmgr.conf
 %{_datadir}/license/call-manager
 %if 0%{?enable_slient_log}
diff --git a/packaging/callmgr.conf b/packaging/callmgr.conf
index c9e7210..c06fc84 100644
--- a/packaging/callmgr.conf
+++ b/packaging/callmgr.conf
@@ -4,9 +4,21 @@
         <policy user="root">
                 <allow own="org.tizen.callmgr"/>
                 <allow send_destination="org.tizen.callmgr"/>
+                <allow send_interface="org.tizen.callmgr"/>
+                <allow receive_sender="org.tizen.callmgr"/>
+        </policy>
+        <policy smack="User">
+                <allow own="org.tizen.callmgr"/>
+                <allow send_destination="org.tizen.callmgr"/>
+                <allow send_interface="org.tizen.callmgr"/>
+                <allow receive_sender="org.tizen.callmgr"/>
+        </policy>
+         <policy smack="System">
+                <allow own="org.tizen.callmgr"/>
+                <allow send_destination="org.tizen.callmgr"/>
+                <allow send_interface="org.tizen.callmgr"/>
                 <allow receive_sender="org.tizen.callmgr"/>
         </policy>
-
         <policy context="default">
                 <allow send_destination="org.tizen.callmgr"/>
                 <allow receive_sender="org.tizen.callmgr"/>
diff --git a/resource/callmgr.service b/resource/callmgr.service
index 8dbf307..c189d4c 100644
--- a/resource/callmgr.service
+++ b/resource/callmgr.service
@@ -10,4 +10,4 @@ Restart=always
 RestartSec=0
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target
diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
index 1c47a24..ba81c4f 100644
--- a/service/CMakeLists.txt
+++ b/service/CMakeLists.txt
@@ -48,4 +48,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${service_pkgs_LDFLAGS} callmgr_module cal
 INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 
 # Configuration files (dbus & smack)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/callmgr.service DESTINATION ${UNITDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/callmgr.service DESTINATION /usr/lib/systemd/user/)
-- 
2.7.4