[Tizen Secure mode] Copy json file in rpm package

Change-Id: Ia5b9e0f45017e4f1b25b0538e613509de58eeb2f
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6073
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/README.txt b/service/easy-setup/sampleapp/enrollee/tizen-sdb/README.txt
index 2e4972a..f5f4f2f 100644 (file)
--- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/README.txt
+++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/README.txt
@@ -58,4 +58,8 @@ Procedure to Execute Sample App:
     7) RPM will be installed in "/usr/apps/"
        Execute the sample app by below commands
         i) cd /usr/apps/com.oic.es.sample/bin
-            a) ./enrollee_wifi
+        If executing with secure mode enabled then do the below step (no. ii)
+        ii) cp /usr/lib/oic_svr_db_server.json .
+
+        Execute the application
+        ./enrollee_wifi

diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec
index 076e540..b940b5c 100644 (file)
--- a/tools/tizen/iotivity.spec
+++ b/tools/tizen/iotivity.spec
@@ -158,19 +158,13 @@ cp out/tizen/*/%{build_mode}/libcoap.a %{buildroot}%{_libdir}
 %if 0%{?SECURED} == 1
 mkdir -p %{ex_install_dir}/provisioning
 mkdir -p %{ex_install_dir}/provision-sample
-cp out/tizen/*/%{build_mode}/resource/provisioning/examples/oic_svr_db_client.json %{ex_install_dir}/provisioning/
-cp out/tizen/*/%{build_mode}/resource/provisioning/examples/provisioningclient %{ex_install_dir}/provisioning/
 
 cp ./resource/csdk/security/include/pinoxmcommon.h %{buildroot}%{_includedir}
 cp ./resource/csdk/security/provisioning/include/oxm/*.h %{buildroot}%{_includedir}
 cp ./resource/csdk/security/provisioning/include/internal/*.h %{buildroot}%{_includedir}
 cp ./resource/csdk/security/provisioning/include/*.h %{buildroot}%{_includedir}
+cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json %{buildroot}%{_libdir}/oic_svr_db_server.json
 
-cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/provisioningclient %{ex_install_dir}/provision-sample/
-cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_justworks %{ex_install_dir}/provision-sample/
-cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_randompin %{ex_install_dir}/provision-sample/
-cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_client.json %{ex_install_dir}/provision-sample/
-cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json %{ex_install_dir}/provision-sample/
 %endif
 
 
@@ -222,6 +216,7 @@ cp service/easy-setup/enrollee/inc/*.h %{buildroot}%{_includedir}
 %if 0%{?SECURED} == 1
 %{_libdir}/libocpmapi.so
 %{_libdir}/libocprovision.so
+%{_libdir}/oic_svr_db_server.json
 %endif
 %if 0%{?tizen_version_major} < 3
 %{_datadir}/license/%{name}-service