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

Reference: submit/tizen/20170224.073744
Commit id: 5b98dcba3bcb89f5f755a2adc157a2e08a91d806
Requested by: gen.azarov@samsung.com
SDK rootstrap version: 20170223_3

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

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

diff --git a/org.tizen.setting-homescreen-1.0.0-arm-debug.tpk b/org.tizen.setting-homescreen-1.0.0-arm-debug.tpk
index cb8be70..dcbc139 100644 (file)
Binary files a/org.tizen.setting-homescreen-1.0.0-arm-debug.tpk and b/org.tizen.setting-homescreen-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.setting-homescreen-1.0.0-arm.tpk b/org.tizen.setting-homescreen-1.0.0-arm.tpk
index 93c5667..9a90c10 100644 (file)
Binary files a/org.tizen.setting-homescreen-1.0.0-arm.tpk and b/org.tizen.setting-homescreen-1.0.0-arm.tpk differ

diff --git a/org.tizen.setting-homescreen-1.0.0-i386-debug.tpk b/org.tizen.setting-homescreen-1.0.0-i386-debug.tpk
index 0760ced..8f7df49 100644 (file)
Binary files a/org.tizen.setting-homescreen-1.0.0-i386-debug.tpk and b/org.tizen.setting-homescreen-1.0.0-i386-debug.tpk differ

diff --git a/org.tizen.setting-homescreen-1.0.0-i386.tpk b/org.tizen.setting-homescreen-1.0.0-i386.tpk
index b30eebc..5eff1e6 100644 (file)
Binary files a/org.tizen.setting-homescreen-1.0.0-i386.tpk and b/org.tizen.setting-homescreen-1.0.0-i386.tpk differ

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

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

diff --git a/packaging/org.tizen.setting-homescreen.spec b/packaging/org.tizen.setting-homescreen.spec
index fad9a3f..7ea2cc5 100644 (file)
--- a/packaging/org.tizen.setting-homescreen.spec
+++ b/packaging/org.tizen.setting-homescreen.spec
@@ -1,14 +1,14 @@
 Name:       org.tizen.setting-homescreen
-#VCS_FROM:   profile/mobile/apps/native/ug-setting-homescreen-efl#0e4bd462ebb176a53ade2286e43737e4bb4807ba
-#RS_Ver:    20160819_1 
+#VCS_FROM:   profile/mobile/apps/native/ug-setting-homescreen-efl#5b98dcba3bcb89f5f755a2adc157a2e08a91d806
+#RS_Ver:    20170223_3 
 Summary:    homescreen-setting
 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/ug-setting-homescreen-efl#0e4bd462ebb176a53ade2286e43737e4bb4807ba
+profile/mobile/apps/native/ug-setting-homescreen-efl#5b98dcba3bcb89f5f755a2adc157a2e08a91d806
 This is a container package which have preload TPK files
 
 %prep