Merge remote-tracking branch 'origin/tizen' into security-manager

Change-Id: I4f10ef0ccc3b82b26c7db6cb5a84d4d6874d976e
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>

diff --combined packaging/security-tests.spec
index 9f5a118,18011c5..27e91ba
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -18,7 -18,6 +18,6 @@@ BuildRequires: pkgconfig(glib-2.0
  BuildRequires: pkgconfig(dbus-1)
  BuildRequires: pkgconfig(libpcrecpp)
  BuildRequires: pkgconfig(libxml-2.0)
- BuildRequires: pkgconfig(libiri)
  BuildRequires: pkgconfig(sqlite3)
  BuildRequires: pkgconfig(libwebappenc)
  BuildRequires: cynara-devel
@@@ -44,6 -43,7 +43,7 @@@ export LDFLAGS+="-Wl,--rpath=%{_prefix}
  
  cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
          -DDPL_LOG="ON"                    \
+         -DDPL_WITH_DLOG="ON"              \
          -DVERSION=%{version}              \
          -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:DEBUG} \
  %if "%{sec_product_feature_security_mdfpp_enable}" == "1"
@@@ -83,7 -83,7 +83,7 @@@ echo "security-tests postinst done ...
  /usr/bin/security-manager-tests
  /etc/smack/test_smack_rules
  /etc/smack/test_smack_rules_lnk
 -/usr/apps/*
 +/opt/usr/apps/*
  /usr/bin/cynara-test
  /usr/bin/ckm-tests
  /usr/bin/ckm-integration-tests