Merged 'rsa/master' into rsa/systemd.

Change-Id: I08d00510337c65ab58e9fca3f32f3b1d54aa2a06

diff --cc CMakeLists.txt
Simple merge

diff --cc packaging/system-server.spec
index 78a174a,c14f1a7..a0cbd67
--- 1/packaging/system-server.spec
--- 2/packaging/system-server.spec
+++ b/packaging/system-server.spec
@@@ -6,7 -6,8 +6,8 @@@ Release:    
  Group:      TO_BE/FILLED_IN
  License:    Flora Software License
  Source0:    system-server-%{version}.tar.gz
 -Requires(post): /usr/bin/vconftool
 +Source1:    system-server.service
+ Source2:    system-server.manifest
  BuildRequires:  cmake
  BuildRequires:  libattr-devel
  BuildRequires:  pkgconfig(ecore)
@@@ -23,10 -24,8 +24,12 @@@ BuildRequires:  pkgconfig(devman_plugin
  BuildRequires:  pkgconfig(x11)
  BuildRequires:  pkgconfig(svi)
  BuildRequires:  pkgconfig(notification)
+ BuildRequires:  pkgconfig(usbutils)
+ BuildRequires:        gettext
 +Requires(preun): /usr/bin/systemctl
 +Requires(post): /usr/bin/systemctl
 +Requires(post): /usr/bin/vconftool
 +Requires(postun): /usr/bin/systemctl
  
  %description
  Description: System server
@@@ -48,12 -48,8 +52,11 @@@ ln -s %{_sysconfdir}/init.d/system_serv
  mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d/
  ln -s %{_sysconfdir}/init.d/system_server.sh %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S00system-server
  
 -%post
 +mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
 +install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/system-server.service
 +ln -s ../system-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/system-server.service
  
- 
 +%post
  vconftool set -t int memory/sysman/usbhost_status -1 -i
  vconftool set -t int memory/sysman/mmc -1 -i
  vconftool set -t int memory/sysman/earjack_key 0 -i
@@@ -104,32 -94,18 +102,35 @@@ if ! [ -L /etc/udev/rules.d/91-system-s
          ln -s %{_datadir}/system-server/udev-rules/91-system-server.rules /etc/udev/rules.d/91-system-server.rules
  fi
  
- 
 +systemctl daemon-reload
 +if [ $1 == 1 ]; then
 +    systemctl restart system-server.service
 +fi
 +
 +%preun
 +if [ $1 == 0 ]; then
 +    systemctl stop system-server.service
 +fi
 +
 +%postun
 +systemctl daemon-reload
 +
 +
  %files
+ %manifest system-server.manifest
++%config %{_sysconfdir}/dbus-1/system.d/system-server.conf
++%{_sysconfdir}/rc.d/init.d/system_server.sh
++%{_sysconfdir}/rc.d/rc3.d/S35system-server
++%{_sysconfdir}/rc.d/rc5.d/S00system-server
  %{_bindir}/system_server
  %{_bindir}/restart
  %{_bindir}/movi_format.sh
  %{_bindir}/sys_event
  %{_bindir}/sys_device_noti
- %{_datadir}/system-server/sys_device_noti/batt_full_icon.png
+ %{_bindir}/sys_pci_noti
 +%{_libdir}/systemd/system/multi-user.target.wants/system-server.service
 +%{_libdir}/systemd/system/system-server.service
+ %{_datadir}/system-server/sys_device_noti/batt_full_icon.png
  %{_datadir}/system-server/udev-rules/91-system-server.rules
- %config %{_sysconfdir}/dbus-1/system.d/system-server.conf
- %{_sysconfdir}/rc.d/init.d/system_server.sh
- %{_sysconfdir}/rc.d/rc3.d/S35system-server
- %{_sysconfdir}/rc.d/rc5.d/S00system-server
+ %{_datadir}/system-server/sys_device_noti/res/locale/*/LC_MESSAGES/*.mo
+ %{_datadir}/system-server/sys_pci_noti/res/locale/*/LC_MESSAGES/*.mo
 -%{_sysconfdir}/rc.d/init.d/system_server.sh
 -%{_sysconfdir}/rc.d/rc3.d/S35system-server
 -%{_sysconfdir}/rc.d/rc5.d/S00system-server