From: Konrad Lipinski <k.lipinski2@partner.samsung.com>
Date: Fri, 6 Jul 2018 10:39:14 +0000 (+0200)
Subject: Make spec compliant with gbs --incremental
X-Git-Tag: submit/tizen/20180808.090732~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e1bfaa916ea326b5826b1ae1ea24eb6232ff67a9;p=platform%2Fcore%2Fsecurity%2Fsecurity-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.

As a byproduct, got a warning about an installed but unpackaged file:
  security-manager-tests.manifest
Corrected the '%files -n security-manager-tests' accordingly by spelling
out the file name verbatim.

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: I29beaccfc83ae65698833696497c0f8791651ffc
---

diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec
index dfc7806d..7f927769 100644
--- a/packaging/security-manager.spec
+++ b/packaging/security-manager.spec
@@ -100,10 +100,6 @@ Package with plugins for cynara.
 
 %prep
 %setup -q
-cp %{SOURCE1} .
-cp %{SOURCE3} .
-cp %{SOURCE4} .
-cp %{SOURCE5} .
 
 %build
 
@@ -149,6 +145,8 @@ install -m 0444 /dev/null %{buildroot}%{TZ_SYS_VAR}/security-manager/policy-vers
 mkdir -p %{buildroot}/%{db_test_dir}
 sqlite3 %{buildroot}/%{db_test_dir}/.security-manager-test.db  <  db/db.sql
 
+cp -a %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{buildroot}%{_datadir}/
+
 %clean
 rm -rf %{buildroot}
 
@@ -241,7 +239,7 @@ chsmack -a System %{db_test_dir}/.security-manager-test.db
 chsmack -a System %{db_test_dir}/.security-manager-test.db-journal
 
 %files -n security-manager
-%manifest security-manager.manifest
+%manifest %{_datadir}/security-manager.manifest
 %license LICENSE
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/security-manager-migration
@@ -273,13 +271,13 @@ chsmack -a System %{db_test_dir}/.security-manager-test.db-journal
 %dir %attr(700,root,root) %{_datadir}/%{name}/dummy/
 
 %files -n libsecurity-manager-client
-%manifest libsecurity-manager-client.manifest
+%manifest %{_datadir}/libsecurity-manager-client.manifest
 %license LICENSE
 %defattr(-,root,root,-)
 %{_libdir}/libsecurity-manager-client.so.*
 
 %files -n libsecurity-manager-client-devel
-%manifest %{name}.manifest
+%manifest %{_datadir}/%{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libsecurity-manager-client.so
 %{_libdir}/libsecurity-manager-commons.so
@@ -287,14 +285,14 @@ chsmack -a System %{db_test_dir}/.security-manager-test.db-journal
 %{_libdir}/pkgconfig/security-manager.pc
 
 %files -n libnss-security-manager
-%manifest libnss-security-manager.manifest
+%manifest %{_datadir}/libnss-security-manager.manifest
 %license LICENSE
 %defattr(-,root,root,-)
 %%attr(-,root,root) %{_unitdir}/dbus.service.wants/security-manager.service
 %{_libdir}/libnss_securitymanager.so.*
 
 %files -n security-manager-policy
-%manifest %{name}.manifest
+%manifest %{_datadir}/%{name}.manifest
 %license LICENSE
 %config(noreplace) %{TZ_SYS_VAR}/security-manager/policy-version
 %{_datadir}/security-manager/policy
@@ -302,7 +300,7 @@ chsmack -a System %{db_test_dir}/.security-manager-test.db-journal
 %attr(755,root,root) %{_sysconfdir}/opt/upgrade/241.security-manager.policy-update.sh
 
 %files -n security-manager-tests
-%manifest %{name}.manifest
+%manifest %{_datadir}/security-manager-tests.manifest
 %attr(755,root,root) %{_bindir}/security-manager-unit-tests
 %attr(755,root,root) %{_bindir}/security-manager-performance-tests
 %attr(0600,root,root) %{db_test_dir}/.security-manager-test.db