cbhm - init scripts removal

Signed-off-by: Jacek Pielaszkiewicz <j.pielaszkie@samsung.com>
Conflicts:

	packaging/cbhm.spec

Change-Id: I0c6a29933e53ab564cc2ebd9800dff5f26d7f310
Signed-off-by: Jacek Pielaszkiewicz <j.pielaszkie@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56352c2..ce4c186 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,5 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/data/themes/cbhmdrawer.edj DESTINATION share/edje)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/data/images/cbhm_default_img.png DESTINATION share/cbhm/icons)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/cbhm.service DESTINATION /usr/lib/systemd/user)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/data/init_script/cbhm DESTINATION /etc/init.d PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 

diff --git a/cbhm.manifest b/cbhm.manifest
index 99ac57f..dcabd31 100644 (file)
--- a/cbhm.manifest
+++ b/cbhm.manifest
@@ -6,8 +6,6 @@
                <domain name="cbhm"/>
        </request>
        <assign>
-               <filesystem path="/etc/init.d/cbhm" label="_" exec_label="none" />
-               <filesystem path="/etc/rc.d/rc3.d/S95cbhm" label="_" exec_label="none" />
                <filesystem path="/usr/lib/systemd/user/cbhm.service" label="_" exec_label="none" />
                <filesystem path="/usr/lib/systemd/user/core-efl.target.wants/cbhm.service" label="_" exec_label="none" />
        </assign>

diff --git a/data/init_script/cbhm b/data/init_script/cbhm
deleted file mode 100755 (executable)
index 087b703..0000000
--- a/data/init_script/cbhm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/cbhm &

diff --git a/packaging/cbhm.spec b/packaging/cbhm.spec
index 13b4c9f..0088a77 100644 (file)
--- a/packaging/cbhm.spec
+++ b/packaging/cbhm.spec
@@ -40,11 +40,8 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/share/license
 cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/usr/share/license/%{name}
 
-mkdir -p %{buildroot}%{_sysconfdir}/init.d
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d
 mkdir -p %{buildroot}/usr/lib/systemd/user/core-efl.target.wants
 
-ln -s /etc/init.d/cbhm %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S95cbhm
 mkdir -p %{buildroot}/etc/smack/accesses.d/
 cp %{_builddir}/%{buildsubdir}/cbhm.rule %{buildroot}/etc/smack/accesses.d/cbhm.rule
 ln -s ../cbhm.service  %{buildroot}/usr/lib/systemd/user/core-efl.target.wants/cbhm.service
@@ -59,8 +56,6 @@ echo "INFO: System should be restarted or execute: systemctl --user daemon-reloa
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_sysconfdir}/init.d/cbhm
-%{_sysconfdir}/rc.d/rc3.d/S95cbhm
 %{_bindir}/cbhm
 %{_datadir}/cbhm/icons/cbhm_default_img.png
 %{_datadir}/edje/cbhmdrawer.edj