[ABS] Merge branch 'tizen_3.0' into tizen

Reference: submit/tizen/20170221.142118
Commit id: 253fca80d86a03aeb7ef81bbf7d195e6e71d7adb
Requested by: i.olshevskyi@samsung.com
SDK rootstrap version: 20170217_3

diff --git a/org.tizen.call-setting-1.0.0-aarch64-debug.tpk b/org.tizen.call-setting-1.0.0-aarch64-debug.tpk
new file mode 100644 (file)
index 0000000..93ce1a2
Binary files /dev/null and b/org.tizen.call-setting-1.0.0-aarch64-debug.tpk differ

diff --git a/org.tizen.call-setting-1.0.0-aarch64.tpk b/org.tizen.call-setting-1.0.0-aarch64.tpk
new file mode 100644 (file)
index 0000000..67bf196
Binary files /dev/null and b/org.tizen.call-setting-1.0.0-aarch64.tpk differ

diff --git a/org.tizen.call-setting-1.0.0-arm-debug.tpk b/org.tizen.call-setting-1.0.0-arm-debug.tpk
index ca4e2f9b2bfdf1076d6dc988a719112a780ba3cc..dd9f631b9c7d3d2a40f55211410b47f0f3e7bbab 100644 (file)
Binary files a/org.tizen.call-setting-1.0.0-arm-debug.tpk and b/org.tizen.call-setting-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.call-setting-1.0.0-arm.tpk b/org.tizen.call-setting-1.0.0-arm.tpk
index 21cedf8459b2752b80a18342add4f2795f1c3147..7174529e3a310dff645e86b7fc88779f7b9710bf 100644 (file)
Binary files a/org.tizen.call-setting-1.0.0-arm.tpk and b/org.tizen.call-setting-1.0.0-arm.tpk differ

diff --git a/org.tizen.call-setting-1.0.0-i386-debug.tpk b/org.tizen.call-setting-1.0.0-i386-debug.tpk
index 866a69c9cf8acc28c7f6f246356bb2e31344c37f..67775061303f90112c9be5c48c5996570bbb572c 100644 (file)
Binary files a/org.tizen.call-setting-1.0.0-i386-debug.tpk and b/org.tizen.call-setting-1.0.0-i386-debug.tpk differ

diff --git a/org.tizen.call-setting-1.0.0-i386.tpk b/org.tizen.call-setting-1.0.0-i386.tpk
index ce996d4ad9f5a9cd2b5515f56b26af197cf53dad..53c12454d9b2291ce4aff1e1d397faa01888a096 100644 (file)
Binary files a/org.tizen.call-setting-1.0.0-i386.tpk and b/org.tizen.call-setting-1.0.0-i386.tpk differ

diff --git a/org.tizen.call-setting-1.0.0-x86_64-debug.tpk b/org.tizen.call-setting-1.0.0-x86_64-debug.tpk
new file mode 100644 (file)
index 0000000..203234c
Binary files /dev/null and b/org.tizen.call-setting-1.0.0-x86_64-debug.tpk differ

diff --git a/org.tizen.call-setting-1.0.0-x86_64.tpk b/org.tizen.call-setting-1.0.0-x86_64.tpk
new file mode 100644 (file)
index 0000000..bbc7615
Binary files /dev/null and b/org.tizen.call-setting-1.0.0-x86_64.tpk differ

diff --git a/packaging/org.tizen.call-setting.spec b/packaging/org.tizen.call-setting.spec
index b58c1922959e833200f2fd3a68d69603a6c1689f..32887bead835b2951f72928d8b80157e3e305a77 100644 (file)
--- a/packaging/org.tizen.call-setting.spec
+++ b/packaging/org.tizen.call-setting.spec
@@ -1,14 +1,14 @@
 Name:       org.tizen.call-setting
-#VCS_FROM:   profile/mobile/apps/native/call-setting#c8e7288140e1921eff72550d53463ec11b910d53
-#RS_Ver:    20161102_1 
+#VCS_FROM:   profile/mobile/apps/native/call-setting#253fca80d86a03aeb7ef81bbf7d195e6e71d7adb
+#RS_Ver:    20170217_3 
 Summary:    Call Settings
 Version:    1.0.0
 Release:    1
 Group:      Applications/Core Applications
-License:    Apache-2.0
+License:    Flora-1.1
 Source0:    %{name}-%{version}.tar.gz
 
-ExcludeArch:  aarch64 x86_64
+
 BuildRequires:  pkgconfig(libtzplatform-config)
 Requires(post):  /usr/bin/tpk-backend
 
@@ -17,18 +17,20 @@ Requires(post):  /usr/bin/tpk-backend
 
 %define build_mode %{nil}
 
-%ifarch i386 i486 i586 i686 x86_64
-%define target i386
-%else
-%ifarch arm armv7l aarch64
+%ifarch arm armv7l
 %define target arm
-%else
-%define target noarch
 %endif
+%ifarch aarch64
+%define target aarch64
+%endif
+%ifarch x86_64
+%define target x86_64
+%endif
+%ifarch i386 i486 i586 i686
+%define target i386
 %endif
-
 %description
-profile/mobile/apps/native/call-setting#c8e7288140e1921eff72550d53463ec11b910d53
+profile/mobile/apps/native/call-setting#253fca80d86a03aeb7ef81bbf7d195e6e71d7adb
 This is a container package which have preload TPK files
 
 %prep