Merge branch 'systemd'

Change-Id: I719b5edd00cf20d84ffd56f7bc4806dedb8207a4

diff --cc packaging/alarm-manager.spec
index 965759d,3af2b62..f25e479
--- 1/packaging/alarm-manager.spec
--- 2/packaging/alarm-manager.spec
+++ b/packaging/alarm-manager.spec
@@@ -79,27 -81,39 +84,38 @@@ rm -rf %{buildroot
  mkdir -p %{buildroot}/etc/init.d
  install -m 755 alarm-server_run %{buildroot}/etc/init.d
  
+ mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc3.d
+ mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc5.d
+ ln -s ../init.d/alarm-server_run %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S80alarm-server
+ ln -s ../init.d/alarm-server_run %{buildroot}/%{_sysconfdir}/rc.d/rc5.d/S80alarm-server
+ 
+ install -d %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+ install -m0644 %{SOURCE101} %{buildroot}%{_libdir}/systemd/system/
+ ln -sf ../alarm-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/alarm-server.service
  
- %post -p /sbin/ldconfig
  
- %postun -p /sbin/ldconfig
+ %preun -n alarm-server
+ if [ $1 == 0 ]; then
+     systemctl stop alarm-server.service
+ fi
  
  %post -n alarm-server
+ /sbin/ldconfig
  
 -heynotitool set setting_time_changed -a
  vconftool set -t int db/system/timechange 0 -i
 -vconftool set -t int memory/system/timechanged 0 -i
 +vconftool set -t int memory/system/timechanged 0 -i -g 5000
  
- chmod 755 /usr/bin/alarm-server
- chmod 755 /etc/init.d/alarm-server_run
- 
- mkdir -p /etc/rc.d/rc3.d
- mkdir -p /etc/rc.d/rc5.d
- ln -s /etc/init.d/alarm-server_run /etc/rc.d/rc3.d/S80alarm-server
- ln -s /etc/init.d/alarm-server_run /etc/rc.d/rc5.d/S80alarm-server
- 
- %post -n libalarm
- chmod 644 /usr/lib/libalarm.so.0.0.0
+ systemctl daemon-reload
+ if [ $1 == 1 ]; then
+     systemctl restart alarm-server.service
+ fi
  
+ %postun -n alarm-server
+ /sbin/ldconfig
+ systemctl daemon-reload
+ if [ "$1" == 1 ]; then
+     systemctl restart net-config.service
+ fi
  
  %files -n alarm-server
  %manifest alarm-server.manifest