Merge branch 'tizen' into security-manager

[platform/core/test/security-tests.git] / packaging / security-tests.spec

diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec
index 0769110..4be1f8d 100644 (file)
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -13,15 +13,17 @@ BuildRequires: pkgconfig(libcap)
 BuildRequires: pkgconfig(libsmack)
 BuildRequires: pkgconfig(security-manager)
 BuildRequires: pkgconfig(key-manager)
+BuildRequires: pkgconfig(yaca)
 BuildRequires: pkgconfig(dlog)
 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
+BuildRequires: libcynara-creds-dbus-devel
+BuildRequires: libcynara-creds-gdbus-devel
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: boost-devel
 BuildRequires: pkgconfig(vconf)
@@ -44,6 +46,7 @@ export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib"
 
 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"
@@ -53,7 +56,8 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -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
@@ -64,6 +68,9 @@ ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk
 id -u  security_test_user 1>/dev/null 2>&1 || \
     useradd -r -g users -s /sbin/nologin -c "for tests only" security_test_user
 
+# Reload dbus daemon to apply newly installed configuration
+systemctl reload dbus
+
 echo "security-tests postinst done ..."
 
 %files
@@ -83,10 +90,11 @@ 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
+/usr/bin/yaca-test
 %{ckm_test_dir}/*
 /etc/security-tests
 /usr/lib/security-tests/cynara-tests/plugins/single-policy/*
@@ -94,6 +102,7 @@ echo "security-tests postinst done ..."
 /usr/lib/security-tests/cynara-tests/plugins/test-agent/*
 /usr/bin/security-tests-inner-test
 /usr/bin/libwebappenc-tests
+%{_prefix}/share/yaca-test
 
 %postun
 id -u security_test_user  1>/dev/null 2>&1 && userdel security_test_user