Merge branch 'tizen' into ode

Change-Id: Ic562abbef0de256d5f0f0697709de296d7d8c986

diff --combined 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)
@@@ -26,32 -27,34 +28,37 @@@ BuildRequires: pkgconfig(openssl
  BuildRequires: cynara-devel
  BuildRequires: libcynara-creds-dbus-devel
  BuildRequires: libcynara-creds-gdbus-devel
+ BuildRequires: libcynara-creds-sd-bus-devel
  BuildRequires: pkgconfig(libtzplatform-config)
  BuildRequires: boost-devel
  BuildRequires: pkgconfig(vconf)
  BuildRequires: pkgconfig(libgum) >= 1.0.5
  BuildRequires: pkgconfig(security-privilege-manager)
+ BuildRequires: pkgconfig(libsystemd)
  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/}
+ %global tz_backend_enabled %{?tz_backend:%tz_backend}%{!?tz_backend:OFF}
  
  %description
  Security tests repository - for tests that can't be kept together with code.
  
  %prep
  %setup -q
- cp %{SOURCE1} .
  
  %build
  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}              \
@@@ -75,6 -78,7 +82,7 @@@ id -u  security_test_user 1>/dev/null 2
  %install
  %make_install
  ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk
+ cp -a %{SOURCE1} %{buildroot}%{_datadir}/
  
  %post
  # Reload dbus daemon to apply newly installed configuration
@@@ -83,7 -87,7 +91,7 @@@ systemctl reload dbu
  echo "security-tests postinst done ..."
  
  %files
- %manifest %{name}.manifest
+ %manifest %{_datadir}/%{name}.manifest
  %defattr(-, root, root, -)
  /usr/bin/security-tests.sh
  /usr/bin/security-tests-all.sh
@@@ -103,11 -107,9 +111,10 @@@
  %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/*