Fix building rpm packages.

[Bug/Feature]   Not deleted configs after rpm packages erasing.
[Cause]         Configs are not marked in spec file.
[Solution]      Move configs to a single directory.
                Mark all configs in spec file.
[Verification]  Build, install, uninstall

Change-Id: I9728eb67e756ceca1d5cad8078d0040e7018975b
Signed-off-by: Dariusz Michaluk <d.michaluk@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5cb3e3..743860b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,7 +167,6 @@ IF(NOT DEFINED DATA_DIR)
 ENDIF(NOT DEFINED DATA_DIR)
 
 SET(VSM_CONFIG_INSTALL_DIR ${SYSCONF_INSTALL_DIR}/vasum)
-SET(VSM_DATA_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/vasum)
 
 ADD_SUBDIRECTORY(${CLIENT_FOLDER})
 ADD_SUBDIRECTORY(${SERVER_FOLDER})

diff --git a/packaging/vasum.spec b/packaging/vasum.spec
index db8d6be..bd7e9f1 100644 (file)
--- a/packaging/vasum.spec
+++ b/packaging/vasum.spec
@@ -50,7 +50,7 @@ between them. A process from inside a zone can request a switch of context
 %{_unitdir}/vasum.service
 %{_unitdir}/vasum.socket
 %{_unitdir}/multi-user.target.wants/vasum.service
-/etc/dbus-1/system.d/org.tizen.vasum.host.conf
+%config /etc/dbus-1/system.d/org.tizen.vasum.host.conf
 %dir %{_datadir}/.zones
 
 %prep
@@ -165,7 +165,7 @@ Zones support installed inside every zone.
 %files zone-support
 %manifest packaging/vasum-zone-support.manifest
 %defattr(644,root,root,755)
-/etc/dbus-1/system.d/org.tizen.vasum.zone.conf
+%config /etc/dbus-1/system.d/org.tizen.vasum.zone.conf
 
 
 ## Zone Daemon Package ####################################################
@@ -182,7 +182,7 @@ Daemon running inside every zone.
 %manifest packaging/vasum-zone-daemon.manifest
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/vasum-zone-daemon
-/etc/dbus-1/system.d/org.tizen.vasum.zone.daemon.conf
+%config /etc/dbus-1/system.d/org.tizen.vasum.zone.daemon.conf
 
 
 ## Command Line Interface ######################################################
@@ -233,9 +233,9 @@ systemctl daemon-reload
 %attr(755,root,root) %{script_dir}/vsm_int_tests.py
 %attr(755,root,root) %{script_dir}/vsm_launch_test.py
 %{script_dir}/vsm_test_parser.py
-%{_datadir}/vasum/tests
-%attr(755,root,root) %{_datadir}/vasum/lxc-templates
+%config /etc/vasum/tests
+%attr(755,root,root) /etc/vasum/tests/lxc-templates
 %{python_sitelib}/vsm_integration_tests
-/etc/dbus-1/system.d/org.tizen.vasum.tests.conf
+%config /etc/dbus-1/system.d/org.tizen.vasum.tests.conf
 %{_unitdir}/vasum-socket-test.socket
 %{_unitdir}/vasum-socket-test.service

diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt
index fc96586..2a561ed 100644 (file)
--- a/tests/unit_tests/CMakeLists.txt
+++ b/tests/unit_tests/CMakeLists.txt
@@ -67,8 +67,8 @@ TARGET_LINK_LIBRARIES(${UT_SERVER_CODENAME} ${UT_SERVER_DEPS_LIBRARIES} ${Boost_
 TARGET_LINK_LIBRARIES(${SOCKET_TEST_CODENAME} ${UT_SERVER_DEPS_LIBRARIES} ${Boost_LIBRARIES})
 
 ## Subdirectories ##############################################################
-SET(VSM_TEST_CONFIG_INSTALL_DIR ${VSM_DATA_INSTALL_DIR}/tests)
-SET(VSM_TEST_LXC_TEMPLATES_INSTALL_DIR ${VSM_DATA_INSTALL_DIR}/lxc-templates/tests)
+SET(VSM_TEST_CONFIG_INSTALL_DIR ${VSM_CONFIG_INSTALL_DIR}/tests)
+SET(VSM_TEST_LXC_TEMPLATES_INSTALL_DIR ${VSM_CONFIG_INSTALL_DIR}/tests/lxc-templates)
 ADD_DEFINITIONS(-DVSM_TEST_CONFIG_INSTALL_DIR="${VSM_TEST_CONFIG_INSTALL_DIR}")
 ADD_DEFINITIONS(-DVSM_TEST_LXC_TEMPLATES_INSTALL_DIR="${VSM_TEST_LXC_TEMPLATES_INSTALL_DIR}")