[ABS] Merge branch 'tizen_dev' into tizen

Reference: submit/tizen/20170811.141832
Commit id: 9783350f42e3ae47e0c9fa619500bdfee4efb4d6
Requested by: gen.azarov@samsung.com
SDK rootstrap version: 20170811_2

diff --git a/org.tizen.w-call-ui-1.0.0-arm-debug.tpk b/org.tizen.w-call-ui-1.0.0-arm-debug.tpk
index 7b9ee27a953c81e0871308e770412a5a7202c20b..85d3bd4fee44152d6950e959502533f99b2c5448 100644 (file)
Binary files a/org.tizen.w-call-ui-1.0.0-arm-debug.tpk and b/org.tizen.w-call-ui-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.w-call-ui-1.0.0-arm.tpk b/org.tizen.w-call-ui-1.0.0-arm.tpk
index 562ce6b8ce75491817592dfb04606e9edc0a6971..f772a04ebb1157e846fac9f0cded87e086970367 100644 (file)
Binary files a/org.tizen.w-call-ui-1.0.0-arm.tpk and b/org.tizen.w-call-ui-1.0.0-arm.tpk differ

diff --git a/org.tizen.w-call-ui-1.0.0-x86-debug.tpk b/org.tizen.w-call-ui-1.0.0-x86-debug.tpk
index 4adae665629ec0918d3f83a06d89a70bb924b069..9e09ca4723e1db63a2f89b2be45772585f21a98e 100644 (file)
Binary files a/org.tizen.w-call-ui-1.0.0-x86-debug.tpk and b/org.tizen.w-call-ui-1.0.0-x86-debug.tpk differ

diff --git a/org.tizen.w-call-ui-1.0.0-x86.tpk b/org.tizen.w-call-ui-1.0.0-x86.tpk
index 517da4d3ca1ced2d96fd2d09048cb49502cd8712..9379f9c32f7a2a98eb0215f301717429a59816f3 100644 (file)
Binary files a/org.tizen.w-call-ui-1.0.0-x86.tpk and b/org.tizen.w-call-ui-1.0.0-x86.tpk differ

diff --git a/packaging/org.tizen.w-call-ui.spec b/packaging/org.tizen.w-call-ui.spec
index c17edb7dcd5979e1297e0498659a8797b156afc1..9e02f2df4e5366f64badf3e049eb75515cd9e3f9 100644 (file)
--- a/packaging/org.tizen.w-call-ui.spec
+++ b/packaging/org.tizen.w-call-ui.spec
@@ -1,6 +1,6 @@
 Name:       org.tizen.w-call-ui
-#VCS_FROM:   profile/wearable/apps/native/call-ui#c272af9fde05c98ab1f285ca67ed35d4f2ce3aac
-#RS_Ver:    20170714_3 
+#VCS_FROM:   profile/wearable/apps/native/call-ui#9783350f42e3ae47e0c9fa619500bdfee4efb4d6
+#RS_Ver:    20170811_2 
 Summary:    w-call-ui
 Version:    1.0.0
 Release:    1
@@ -10,11 +10,12 @@ Source0:    %{name}-%{version}.tar.gz
 
 ExclusiveArch:  i586 x86 i486 i686 i386 armv7l arm
 
+
 BuildRequires:  pkgconfig(libtzplatform-config)
 Requires(post):  /usr/bin/tpk-backend
 
 %define internal_name org.tizen.w-call-ui
-%define preload_tpk_path %{TZ_SYS_RO_APP}/.preload-tpk 
+%define preload_tpk_path %{TZ_SYS_RO_APP}/.preload-tpk
 
 %define build_mode %{nil}
 
@@ -30,8 +31,9 @@ Requires(post):  /usr/bin/tpk-backend
 %ifarch i386 i486 i586 i686
 %define target x86
 %endif
+
 %description
-profile/wearable/apps/native/call-ui#c272af9fde05c98ab1f285ca67ed35d4f2ce3aac
+profile/wearable/apps/native/call-ui#9783350f42e3ae47e0c9fa619500bdfee4efb4d6
 This is a container package which have preload TPK files
 
 %prep
@@ -49,3 +51,4 @@ install %{internal_name}-%{version}-%{target}%{build_mode}.tpk %{buildroot}/%{pr
 %files
 %defattr(-,root,root,-)
 %{preload_tpk_path}/*
+