Merge branch 'tizen' into ode

Change-Id: Ic562abbef0de256d5f0f0697709de296d7d8c986

diff --cc packaging/security-tests.spec
index af50270,9809e03..efe5a96
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -13,8 -13,9 +13,10 @@@ BuildRequires: pkgconfig(libcap
  BuildRequires: pkgconfig(libsmack)
  BuildRequires: pkgconfig(security-manager)
  BuildRequires: pkgconfig(key-manager)
+ BuildRequires: key-manager-initial-values
+ BuildRequires: util-linux
  BuildRequires: pkgconfig(yaca)
 +BuildRequires: pkgconfig(ode)
  BuildRequires: pkgconfig(dlog)
  BuildRequires: pkgconfig(glib-2.0)
  BuildRequires: pkgconfig(dbus-1)
@@@ -49,9 -52,9 +53,12 @@@ Security tests repository - for tests t
  export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib"
  
  cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 +%if "%{_with_emulator}" == "1"
 +        -DEMULATOR="ON"                   \
 +%endif
+ %if %{tz_backend_enabled} == ON
+         -DTZ_BACKEND="ON"                 \
+ %endif
          -DDPL_LOG="ON"                    \
          -DDPL_WITH_DLOG="ON"              \
          -DVERSION=%{version}              \
@@@ -103,11 -107,9 +111,10 @@@ echo "security-tests postinst done ...
  %attr(755, security_test_user,users) %{TZ_SYS_HOME}/security_test_user/apps_rw/*
  /usr/bin/cynara-test
  /usr/bin/ckm-tests
- /usr/bin/ckm-privileged-tests
- /usr/bin/ckm-tests-on-onlycap.sh
- /usr/bin/ckm-integration-tests
+ %caps(cap_mac_admin=ep) /usr/bin/ckm-privileged-tests
+ %caps(cap_mac_admin=ep) /usr/bin/ckm-integration-tests
  /usr/bin/yaca-test
 +/usr/bin/ode-tests
  %{ckm_test_dir}/*
  /etc/security-tests
  /usr/lib/security-tests/cynara-tests/plugins/single-policy/*