From: Konrad Lipinski <k.lipinski2@partner.samsung.com>
Date: Mon, 27 May 2019 11:26:43 +0000 (+0200)
Subject: Make spec compliant with gbs --incremental
X-Git-Tag: submit/tizen/20190607.051000~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8651d1929eff4aaab6a838e924d7e8d953dfc047;p=platform%2Fcore%2Fsecurity%2Faskuser.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: I07253db622da7274e79d2a30a6a077304b86127a
---

diff --git a/packaging/askuser-notification.spec b/packaging/askuser-notification.spec
index cac8797..40fca12 100644
--- a/packaging/askuser-notification.spec
+++ b/packaging/askuser-notification.spec
@@ -88,8 +88,6 @@ can make a decision whether to give a privilege to an application or not.
 
 %prep
 %setup -q
-cp -a %{SOURCE1001} .
-cp -a %{SOURCE1002} .
 
 %build
 %if 0%{?sec_build_binary_debug_enable}
@@ -119,6 +117,8 @@ mkdir -p %{buildroot}/%{_unitdir_user}/sockets.target.wants
 ln -s ../askuser-notification-stream.socket %{buildroot}/%{_unitdir_user}/sockets.target.wants/askuser-notification-stream.socket
 %endif
 
+cp -a %{SOURCE1001} %{SOURCE1002} %{buildroot}%{_datadir}/
+
 %post
 %if %{with_systemd_daemon}
 systemctl daemon-reload
@@ -148,7 +148,7 @@ systemctl restart cynara.service
 %postun -n capi-privacy-privilege-manager -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%manifest default.manifest
+%manifest %{_datadir}/default.manifest
 %license LICENSE
 %attr(755,root,root) /usr/bin/askuser-notification
 %if %{with_systemd_daemon}
@@ -160,7 +160,7 @@ systemctl restart cynara.service
 %{_libdir}/cynara/plugin/service/*.so
 
 %files -n libaskuser-notification-common
-%manifest libaskuser-notification-common.manifest
+%manifest %{_datadir}/libaskuser-notification-common.manifest
 %license LICENSE
 %{_libdir}/libaskuser-notification-common.so*
 %{_libdir}/libaskuser-notification.so.*
@@ -172,18 +172,18 @@ systemctl restart cynara.service
 %{_libdir}/*.so
 
 %files test
-%manifest default.manifest
+%manifest %{_datadir}/default.manifest
 %license LICENSE
 %attr(755,root,root) %{_bindir}/askuser-notification-test
 %attr(755,root,root) %{_bindir}/capi-privacy-privilege-manager-test
 
 %files client
-%manifest default.manifest
+%manifest %{_datadir}/default.manifest
 %license LICENSE
 %attr(644,-,-) %{_libdir}/libaskuser-notification-client.so.*
 
 %files -n capi-privacy-privilege-manager
-%manifest default.manifest
+%manifest %{_datadir}/default.manifest
 %license LICENSE
 %attr(644,-,-) %{_libdir}/libcapi-privacy-privilege-manager.so.*