Merge branch 'tizen_2.2' into tizen

[platform/core/system/system-server.git] / packaging / system-server.spec

diff --git a/packaging/system-server.spec b/packaging/system-server.spec
index 751b448..49177fc 100755 (executable)
--- a/packaging/system-server.spec
+++ b/packaging/system-server.spec
@@ -6,8 +6,8 @@ Release:    6
 Group:      Framework/system
 License:    Apache License, Version 2.0
 Source0:    system-server-%{version}.tar.gz
-Source1:    system-server.service
 Source2:    system-server.manifest
+Source3:    deviced.manifest
 BuildRequires:  cmake
 BuildRequires:  libattr-devel
 BuildRequires:  pkgconfig(ecore)
@@ -15,17 +15,19 @@ BuildRequires:  pkgconfig(heynoti)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(sysman)
 BuildRequires:  pkgconfig(tapi)
-BuildRequires:  pkgconfig(devman)
 BuildRequires:  pkgconfig(pmapi)
 BuildRequires:  pkgconfig(edbus)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(syspopup-caller)
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(svi)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(usbutils)
+BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(device-node)
+BuildRequires:  pkgconfig(libsmack)
 BuildRequires: gettext
+BuildRequires:  pkgconfig(libsystemd-daemon)
+%{?systemd_requires}
 Requires(preun): /usr/bin/systemctl
 Requires(post): /usr/bin/systemctl
 Requires(post): /usr/bin/vconftool
@@ -34,12 +36,28 @@ Requires(postun): /usr/bin/systemctl
 %description
 Description: System server
 
+%package -n libdeviced
+Summary:    Deviced library
+Group:      Development/Libraries
+
+%description -n libdeviced
+Deviced library for device control
+
+%package -n libdeviced-devel
+Summary:    Deviced library for (devel)
+Group:      Development/Libraries
+Requires:   libdeviced = %{version}-%{release}
+
+%description -n libdeviced-devel
+Deviced library for device control (devel)
+
 %prep
 %setup -q
 %cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 
 %build
 cp %{SOURCE2} .
+cp %{SOURCE3} .
 make %{?jobs:-j%jobs}
 
 %install
@@ -47,13 +65,14 @@ rm -rf %{buildroot}
 %make_install
 
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/system-server.service
+mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
 ln -s ../system-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/system-server.service
+ln -s ../system-server.service %{buildroot}%{_unitdir}/sockets.target.wants/system-server.socket
 
 %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/mmc 0 -i
 vconftool set -t int memory/sysman/earjack_key 0 -i
 vconftool set -t int memory/sysman/added_usb_storage 0 -i
 vconftool set -t int memory/sysman/removed_usb_storage 0 -i
@@ -86,6 +105,11 @@ heynotitool set power_off_start
 
 heynotitool set mmcblk_add
 heynotitool set mmcblk_remove
+heynotitool set device_charge_chgdet
+heynotitool set device_usb_host_add
+heynotitool set device_usb_host_remove
+heynotitool set device_pci_keyboard_add
+heynotitool set device_pci_keyboard_remove
 
 heynotitool set device_usb_chgdet
 heynotitool set device_ta_chgdet
@@ -93,12 +117,7 @@ heynotitool set device_earjack_chgdet
 heynotitool set device_earkey_chgdet
 heynotitool set device_tvout_chgdet
 heynotitool set device_hdmi_chgdet
-heynotitool set device_charge_chgdet
 heynotitool set device_keyboard_chgdet
-heynotitool set device_usb_host_add
-heynotitool set device_usb_host_remove
-heynotitool set device_pci_keyboard_add
-heynotitool set device_pci_keyboard_remove
 
 
 mkdir -p /etc/udev/rules.d
@@ -132,11 +151,22 @@ systemctl daemon-reload
 %endif
 %{_bindir}/movi_format.sh
 %{_bindir}/sys_event
-%{_bindir}/sys_device_noti
 %{_bindir}/sys_pci_noti
+%{_bindir}/mmc-smack-label
 %{_unitdir}/multi-user.target.wants/system-server.service
+%{_unitdir}/sockets.target.wants/system-server.socket
 %{_unitdir}/system-server.service
-%{_datadir}/system-server/sys_device_noti/batt_full_icon.png
+%{_unitdir}/system-server.socket
 %{_datadir}/system-server/udev-rules/91-system-server.rules
-%{_datadir}/system-server/sys_device_noti/res/locale/*/LC_MESSAGES/*.mo
 %{_datadir}/system-server/sys_pci_noti/res/locale/*/LC_MESSAGES/*.mo
+
+%files -n libdeviced
+%defattr(-,root,root,-)
+%{_libdir}/libdeviced.so.*
+%manifest deviced.manifest
+
+%files -n libdeviced-devel
+%defattr(-,root,root,-)
+%{_includedir}/deviced/dd-battery.h
+%{_libdir}/libdeviced.so
+%{_libdir}/pkgconfig/deviced.pc