X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fcsapi-tizenfx.spec;h=b8356bdd316bb1754a99440f618d1390a88e2757;hb=f94d97d46751b3003940be531c885e466ff200cd;hp=2e869f792634b039d32e011ecab9460230bb2cd7;hpb=dba31023cac5fbdd6447ef6d41823d2b7b5cde2c;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
index 2e869f7..b8356bd 100644
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -1,9 +1,8 @@
 # Auto-generated from csapi-tizenfx.spec.in by makespec.sh
 
 %define TIZEN_NET_API_VERSION 5
-%define TIZEN_NET_RPM_VERSION 5.0.0.14552+nui504
-%define TIZEN_NET_NUGET_VERSION 5.0.0.14552
-%define TIZEN_NET_INTERNAL_NUGET_VERSION 5.0.0.14552
+%define TIZEN_NET_RPM_VERSION 5.0.0.14629+nui505
+%define TIZEN_NET_NUGET_VERSION 5.0.0.14629
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
 %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref
@@ -127,15 +126,6 @@ Tizen .NET assemblies for Wearable profile
 %setup -q
 cp %{SOURCE1} .
 
-# prepare external modules
-for ext in $(ls -1 packaging/externals.*.tar.gz); do
-  extname=$(basename -- $ext)
-  extname=${extname#externals\.}
-  extname=${extname%\.tar\.gz}
-  mkdir -p externals/$extname
-  tar xvfz $ext -C externals/$extname
-done
-
 %build
 %{?asan:export ASAN_OPTIONS=use_sigaltstack=false:allow_user_segv_handler=true:handle_sigfpe=false:`cat /ASAN_OPTIONS`}
 
@@ -155,10 +145,11 @@ GetFileList wearable > wearable.filelist
 
 rm -fr %{_tizenfx_bin_path}
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-./build.sh --full
-./build.sh --dummy
-./build.sh --pack %{TIZEN_NET_NUGET_VERSION} %{TIZEN_NET_INTERNAL_NUGET_VERSION}
-./build.sh --ext
+
+%define build_cmd ./tools/scripts/retry.sh ./tools/scripts/timeout.sh -t 600 ./build.sh
+%{build_cmd} --full
+%{build_cmd} --dummy
+%{build_cmd} --pack %{TIZEN_NET_NUGET_VERSION}
 
 %install
 mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH}
@@ -169,14 +160,10 @@ mkdir -p %{buildroot}%{DOTNET_NUGET_SOURCE}
 # Install Runtime Assemblies
 install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH}
-[ -d %{_tizenfx_bin_path}/bin/external ] \
-  && install -p -m 644 %{_tizenfx_bin_path}/bin/external/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 
 # Install Debug Symbols
 install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH}
-[ -d %{_tizenfx_bin_path}/bin/external ] \
-  && install -p -m 644 %{_tizenfx_bin_path}/bin/external/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 
 # Install Resource files
 [ -d %{_tizenfx_bin_path}/bin/public/res ] \