Merge branch 'tizen' into security-manager

Change-Id: I12966cd0f6a6d0a38ddd73400918989e470c9e72

diff --combined packaging/security-tests.spec
index 20b1139,4efc6b0..f981779
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -28,9 -28,9 +28,10 @@@ BuildRequires: pkgconfig(libtzplatform-
  BuildRequires: boost-devel
  BuildRequires: pkgconfig(vconf)
  BuildRequires: pkgconfig(libgum) >= 1.0.5
 +BuildRequires: pkgconfig(security-privilege-manager)
  Requires: perf
  Requires: gdb
+ Requires: diffutils
  
  %global ckm_test_dir %{?TZ_SYS_SHARE:%TZ_SYS_SHARE/ckm-test/}%{!?TZ_SYS_SHARE:/usr/share/ckm-test/}
  %global ckm_rw_data_dir %{?TZ_SYS_DATA:%TZ_SYS_DATA/ckm/}%{!?TZ_SYS_DATA:/opt/data/ckm/}
@@@ -57,8 -57,7 +58,8 @@@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefi
          -DCYNARA_DB_DIR=%{_localstatedir}/cynara/db \
          -DAPP_USER="security_test_user" \
          -DCKM_TEST_DIR=%{ckm_test_dir} \
 -        -DCKM_RW_DATA_DIR=%{ckm_rw_data_dir}
 +        -DCKM_RW_DATA_DIR=%{ckm_rw_data_dir} \
 +        -DGLOBAL_APP_DIR=%{TZ_SYS_RW_APP}
  make %{?jobs:-j%jobs}
  
  %install
@@@ -91,7 -90,7 +92,7 @@@ echo "security-tests postinst done ...
  /usr/bin/security-manager-tests
  /etc/smack/test_smack_rules
  /etc/smack/test_smack_rules_lnk
 -/usr/apps/*
 +%{TZ_SYS_RW_APP}*
  /usr/bin/cynara-test
  /usr/bin/ckm-tests
  /usr/bin/ckm-integration-tests
@@@ -102,8 -101,12 +103,12 @@@
  /usr/lib/security-tests/cynara-tests/plugins/multiple-policy/*
  /usr/lib/security-tests/cynara-tests/plugins/test-agent/*
  /usr/bin/security-tests-inner-test
+ /usr/bin/security-tests-cleanup-test
+ /usr/bin/cleanup_test.sh
  /usr/bin/libwebappenc-tests
  %{_prefix}/share/yaca-test
+ %dir %{_prefix}/share/security-tests-cleanup-test
+ %{_prefix}/share/security-tests-cleanup-test/*
  
  %postun
  id -u security_test_user 1>/dev/null 2>&1 && gum-utils -o -d --uid=`id -u security_test_user`