From: Konrad Lipinski <k.lipinski2@partner.samsung.com>
Date: Thu, 2 Aug 2018 10:44:44 +0000 (+0200)
Subject: Make spec compliant with gbs --incremental
X-Git-Tag: accepted/tizen/unified/20190220.071637~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d9d8282745322c2abe083ebe5511ff92cdd45ff;p=platform%2Fcore%2Fsecurity%2Fkey-manager.git

Make spec compliant with gbs --incremental

According to [1], %prep section of the spec file should contain a single
%setup macro, nothing else. According to [2], manifest %files are best
copied to %{buildroot}%{_datadir} in the %install section.

Moved manifest copy operations from %prep to %install accordingly.

References
[1] https://source.tizen.org/documentation/reference/git-build-system/usage/gbs-build
[2] https://wiki.tizen.org/Security/Application_installation_and_Manifest

Change-Id: Iacf755558636f939a540482f849e810780c19a51
---

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index aead73a..1a3dd0b 100644
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -128,10 +128,6 @@ and password change events from PAM
 
 %prep
 %setup -q
-cp -a %{SOURCE1001} .
-cp -a %{SOURCE1002} .
-cp -a %{SOURCE1003} .
-cp -a %{SOURCE1004} .
 
 %build
 %if 0%{?sec_build_binary_debug_enable}
@@ -182,6 +178,7 @@ make %{?jobs:-j%jobs}
 %install_service sockets.target.wants central-key-manager-api-storage.socket
 %install_service sockets.target.wants central-key-manager-api-ocsp.socket
 %install_service sockets.target.wants central-key-manager-api-encryption.socket
+cp -a %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} %{buildroot}%{_datadir}/
 
 %pre
 # tzplatform-get sync breaked because of on-development situation. comment out just for temporary
@@ -278,23 +275,23 @@ fi
 %{bin_dir}/ckm_tool
 
 %files -n key-manager-pam-plugin
-%manifest key-manager-pam-plugin.manifest
+%manifest %{_datadir}/key-manager-pam-plugin.manifest
 %license LICENSE
 %{_libdir}/security/pam_key_manager_plugin.so*
 
 %files -n libkey-manager-common
-%manifest libkey-manager-common.manifest
+%manifest %{_datadir}/libkey-manager-common.manifest
 %license LICENSE
 %{_libdir}/libkey-manager-common.so.*
 
 %files -n libkey-manager-client
-%manifest libkey-manager-client.manifest
+%manifest %{_datadir}/libkey-manager-client.manifest
 %license LICENSE
 %{_libdir}/libkey-manager-client.so.*
 %{_libdir}/libkey-manager-control-client.so.*
 
 %files -n libkey-manager-client-devel
-%manifest libkey-manager-client-devel.manifest
+%manifest %{_datadir}/libkey-manager-client-devel.manifest
 %license LICENSE
 %{_libdir}/libkey-manager-client.so
 %{_libdir}/libkey-manager-control-client.so