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 8b561ac..a3d222e 100644 (file)
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -26,11 +26,10 @@ BuildRequires: cynara-devel
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: boost-devel
 BuildRequires: pkgconfig(vconf)
-Requires(post): gum-utils
-Requires(postun): gum-utils
-Requires(postun): %{_bindir}/id
+BuildRequires: pkgconfig(libgum) >= 1.0.5
 Requires: perf
 Requires: gdb
+Requires: key-manager-listener
 
 %description
 Security tests repository - for tests that can't be kept together with code.
@@ -50,8 +49,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DSECURITY_MDFPP_STATE_ENABLE=1 \
 %endif
         -DCMAKE_VERBOSE_MAKEFILE=ON       \
-        -DCYNARA_DB_DIR=%{_localstatedir}/cynara/db \
-        -DAPP_USER=security-tests-app
+        -DCYNARA_DB_DIR=%{_localstatedir}/cynara/db
 make %{?jobs:-j%jobs}
 
 %install
@@ -59,13 +57,11 @@ make %{?jobs:-j%jobs}
 ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk
 
 %post
-%{_bindir}/gum-utils --add-user --username=security-tests-app --usertype=4 --offline
-
 find /etc/smack/test_privilege_control_DIR/ -type f -name exec -exec chmod 0755 {} +
-find /usr/apps/test_DIR/ -type f -name exec -exec chmod 0755 {} +
+find /usr/apps/ -type f -name exec -exec chmod 0755 {} +
 
 # Load permissions templates
-api_feature_loader --verbose --clear-permissions
+api_feature_loader --verbose
 
 # Set vconf key for cc-mode testing if vconf key isn't there.
 %if "%{sec_product_feature_security_mdfpp_enable}" != "1"
@@ -75,9 +71,6 @@ api_feature_loader --verbose --clear-permissions
 
 echo "security-tests postinst done ..."
 
-%postun
-%{_bindir}/gum-utils --delete-user --uid=`%{_bindir}/id -u security-tests-app` --offline
-
 %files
 %manifest %{name}.manifest
 %defattr(-, root, root, -)
@@ -106,8 +99,7 @@ echo "security-tests postinst done ..."
 /etc/smack/test_smack_rules_lnk
 /usr/share/privilege-control/*
 /etc/smack/test_privilege_control_DIR/*
-/usr/apps/test_DIR/*
-/home/security-tests-app/test_DIR
+/usr/apps/*
 /usr/bin/test-app-efl
 /usr/bin/test-app-osp
 /usr/bin/test-app-wgt
@@ -118,3 +110,4 @@ echo "security-tests postinst done ..."
 /usr/lib/security-tests/cynara-tests/plugins/single-policy/*
 /usr/lib/security-tests/cynara-tests/plugins/multiple-policy/*
 /usr/lib/security-tests/cynara-tests/plugins/test-agent/*
+/usr/bin/security-tests-inner-test