From: Jeesun Kim <iamjs.kim@samsung.com>
Date: Fri, 27 May 2016 02:43:21 +0000 (+0900)
Subject: 2 daemons are launched, so removed service-alarm.service file
X-Git-Tag: accepted/tizen/common/20160530.132125^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62dac6d9c45dc81f8db41c859b15ae347ba3cc0e;p=platform%2Fcore%2Fpim%2Fcalendar-service.git

2 daemons are launched, so removed service-alarm.service file

Change-Id: I4f119753710220d48a3b3ba63468c67d00544798
---

diff --git a/packaging/ALARM.acalendar-service.service b/packaging/ALARM.acalendar-service.service
index 3233d9a..0d841a1 100644
--- a/packaging/ALARM.acalendar-service.service
+++ b/packaging/ALARM.acalendar-service.service
@@ -1,5 +1,4 @@
 [D-BUS Service]
 Name=ALARM.acalendar-service
 Exec=/bin/false
-User=app
-SystemdService=calendar-service-alarm.service
+SystemdService=calendar-serviced.service
diff --git a/packaging/calendar-service-alarm.service b/packaging/calendar-service-alarm.service
deleted file mode 100644
index fded9c0..0000000
--- a/packaging/calendar-service-alarm.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Calendar Service Alarm
-
-[Service]
-Type=dbus
-BusName=ALARM.acalendar-service
-Environment="TIMEOUT=0"
-ExecStart=/usr/bin/calendar-serviced $TIMEOUT
diff --git a/packaging/calendar-service.spec b/packaging/calendar-service.spec
index c9c3fc2..9cbf63a 100644
--- a/packaging/calendar-service.spec
+++ b/packaging/calendar-service.spec
@@ -1,6 +1,6 @@
 Name:       calendar-service
 Summary:    DB library for calendar
-Version:    0.1.162
+Version:    0.1.163
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -9,8 +9,7 @@ Source1:    %{name}d.service
 Source2:    org.tizen.CalendarService.dbus.service
 Source1001: %{name}.manifest
 Source1002: %{name}.conf.in
-Source2001: %{name}-alarm.service
-Source2002: ALARM.a%{name}.service
+Source2001: ALARM.a%{name}.service
 %if "%{?profile}" == "wearable"
 ExcludeArch: %{arm} %ix86 x86_64
 %endif
@@ -80,9 +79,8 @@ sed -i 's/@DBUS_INTERFACE@/%{_dbus_interface}/g' %{SOURCE1002}
 install -m 0644 %{SOURCE1002} %{buildroot}%{_sysconfdir}/dbus-1/session.d/%{name}.conf
 
 # alarm dbus service file
-install -m 0644 %SOURCE2001 %{buildroot}%{_unitdir_user}
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services
-install -m 0644 %SOURCE2002 %{buildroot}%{_datadir}/dbus-1/system-services
+install -m 0644 %SOURCE2001 %{buildroot}%{_unitdir_user}
 
 
 %post -p /sbin/ldconfig
@@ -99,8 +97,7 @@ install -m 0644 %SOURCE2002 %{buildroot}%{_datadir}/dbus-1/system-services
 %{_unitdir_user}/%{name}d.service
 %{_datadir}/dbus-1/services/%{_dbus_interface}.service
 %config %{_sysconfdir}/dbus-1/session.d/%{name}.conf
-%{_unitdir_user}/%{name}-alarm.service
-%{_datadir}/dbus-1/system-services/ALARM.acalendar-service.service
+%{_unitdir_user}/ALARM.acalendar-service.service
 %license LICENSE.APLv2