Rename systemd/dbus configuration files

Change-Id: Ieac7c40421090a83c65d725182e3adcda20cd43f
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09aa99618b8436c83dfdaaaf9538201b0694de95..369c043448a6025e189210c004b4fb45b0336fd9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,8 +40,6 @@ FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options)
 FIND_PACKAGE(GTest REQUIRED)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/oic_svr_db_capmgr.dat DESTINATION ${SVR_DB_DIR})
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.capmgr.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/capability-manager.service DESTINATION ${UNITDIR})
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tools)

diff --git a/capability-manager.service b/capability-manager.service
deleted file mode 100644 (file)
index e1972a8..0000000
--- a/capability-manager.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Capability Manager
-
-[Service]
-User=app_fw
-Group=app_fw
-SmackProcessLabel=System
-ExecStart=/usr/bin/capmgr

diff --git a/org.tizen.capmgr.conf b/org.tizen.capmgr.conf
deleted file mode 100644 (file)
index 77fe974..0000000
--- a/org.tizen.capmgr.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-    "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<busconfig>
-  <policy user="root">
-    <allow own="org.tizen.capmgr"/>
-  </policy>
-  <policy user="app_fw">
-    <allow own="org.tizen.capmgr"/>
-  </policy>
-  <policy context="default">
-    <allow send_destination="org.tizen.capmgr" send_interface="org.tizen.capmgr"/>
-  </policy>
-</busconfig>

diff --git a/packaging/capmgr.conf b/packaging/capmgr.conf
new file mode 100644 (file)
index 0000000..77fe974
--- /dev/null
+++ b/packaging/capmgr.conf
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+    "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+  <policy user="root">
+    <allow own="org.tizen.capmgr"/>
+  </policy>
+  <policy user="app_fw">
+    <allow own="org.tizen.capmgr"/>
+  </policy>
+  <policy context="default">
+    <allow send_destination="org.tizen.capmgr" send_interface="org.tizen.capmgr"/>
+  </policy>
+</busconfig>

diff --git a/packaging/capmgr.service b/packaging/capmgr.service
new file mode 100644 (file)
index 0000000..e1972a8
--- /dev/null
+++ b/packaging/capmgr.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Capability Manager
+
+[Service]
+User=app_fw
+Group=app_fw
+SmackProcessLabel=System
+ExecStart=/usr/bin/capmgr

diff --git a/packaging/capmgr.spec b/packaging/capmgr.spec
index 37cf754a0df5856d00d1d336ae85b8dcbe70cd70..e9dbf399b4955aa670f389fbb45998872391e056 100644 (file)
--- a/packaging/capmgr.spec
+++ b/packaging/capmgr.spec
@@ -9,6 +9,8 @@ Group:      Application Framework/Package Management
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
+Source1002: %{name}.service
+Source1003: %{name}.conf
 Requires(post): /usr/bin/chsmack
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -52,9 +54,13 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %install
 %make_install
 
-mkdir -p %{buildroot}%{svr_db_dir}
-mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-ln -sf ../capability-manager.service %{buildroot}%{_unitdir}/multi-user.target.wants/capability-manager.service
+install -m 755 -d %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE1002} %{buildroot}%{_unitdir}/
+install -m 755 -d %{buildroot}%{_sysconfdir}/dbus-1/system.d
+install -m 644 %{SOURCE1003} %{buildroot}%{_sysconfdir}/dbus-1/system.d/
+
+install -m 755 -d %{buildroot}%{_unitdir}/multi-user.target.wants
+ln -sf ../%{name}.service %{buildroot}%{_unitdir}/multi-user.target.wants/
 
 %post
 /sbin/ldconfig
@@ -69,9 +75,9 @@ chsmack -a System %{svr_db_path}
 %{_bindir}/capmgr
 %{_bindir}/capmgr_test
 %{_libdir}/libcapmgr-common.so*
-%{_sysconfdir}/dbus-1/system.d/org.tizen.capmgr.conf
-%{_unitdir}/capability-manager.service
-%{_unitdir}/multi-user.target.wants/capability-manager.service
+%{_sysconfdir}/dbus-1/system.d/%{name}.conf
+%{_unitdir}/%{name}.service
+%{_unitdir}/multi-user.target.wants/%{name}.service
 
 %defattr(-,app_fw,app_fw,-)
 %{svr_db_dir}