Merge esd-mod-shortcut module into shortcut package and Add socket

The esd-mod-shortcut module should be installed.
so it's changed to install with lishortcut.
ESD socket file is added for esd communication.

Change-Id: Ib40646751b57ed2e93217d784e9e3386fb2f1537
Signed-off-by: SukhyungKang <shine.kang@samsung.com>

diff --git a/packaging/esd-shortcut.socket b/packaging/esd-shortcut.socket
new file mode 100644 (file)
index 0000000..8892db5
--- /dev/null
+++ b/packaging/esd-shortcut.socket
@@ -0,0 +1,14 @@
+[Unit]
+Description=ESD Shortcut Socket
+DefaultDependencies=no
+Before=sockets.target
+
+[Socket]
+ListenStream=/run/aul/rpcport/.d::org.tizen.appfw.service.esd::Shortcut
+SocketMode=0666
+SmackLabelIPIn=*
+SmackLabelIPOut=@
+Service=esd.service
+
+[Install]
+WantedBy=sockets.target

diff --git a/packaging/libshortcut.spec b/packaging/libshortcut.spec
index ec67838b8125c75e5ccee59b79ef0d46cc153ed0..40839e501fa97271b9584789039c750b53a1eda9 100644 (file)
--- a/packaging/libshortcut.spec
+++ b/packaging/libshortcut.spec
@@ -6,6 +6,7 @@ Group: Applications/Core Applications
 License: Apache-2.0
 Source0: %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
+Source2: esd-shortcut.socket
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -62,13 +63,6 @@ Requires:   %{name}
 %description unittests
 GTest for shortcut API
 
-%package -n esd-mod-shortcut
-Summary:    ESD module for shortcut
-Group:      Application Framework/Service
-
-%description -n esd-mod-shortcut
-This module is for shortcut
-
 #################################################
 # gcov
 #################################################
@@ -124,6 +118,10 @@ install -m 0644 shortcut.zip %{buildroot}%{_datadir}/gcov/shortcut.zip
 rm -rf %{buildroot}
 
 %make_install
+mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
+install -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/esd-shortcut.socket
+ln -sf ../esd-shortcut.socket %{buildroot}%{_unitdir}/sockets.target.wants/esd-shortcut.socket
+
 mkdir -p %{buildroot}%{TZ_SYS_DB}
 
 %if 0%{?gcov:1}
@@ -176,6 +174,9 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/libshortcut.so.*
 %{_sysconfdir}/package-manager/parserlib/*
+%{_moddir}/mod/libesd-mod-shortcut.so
+%{_unitdir}/esd-shortcut.socket
+%{_unitdir}/sockets.target.wants/esd-shortcut.socket
 
 %files devel
 %manifest %{name}.manifest
@@ -201,8 +202,3 @@ fi
 %files gcov
 %{_datadir}/gcov/*
 %endif
-
-%files -n esd-mod-shortcut
-%manifest %{name}.manifest
-%license LICENSE
-%{_moddir}/mod/libesd-mod-shortcut.so