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

Reference: submit/tizen/20170227.073455
Commit id: f76dd4e9330ff89d3efc35cb2a43cb2591540022
Requested by: gen.azarov@samsung.com
SDK rootstrap version: 20170224_2

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-aarch64-debug.tpk b/org.tizen.ug-lockscreen-options-1.0.0-aarch64-debug.tpk
new file mode 100644 (file)
index 0000000..2457b16
Binary files /dev/null and b/org.tizen.ug-lockscreen-options-1.0.0-aarch64-debug.tpk differ

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-aarch64.tpk b/org.tizen.ug-lockscreen-options-1.0.0-aarch64.tpk
new file mode 100644 (file)
index 0000000..bbc3495
Binary files /dev/null and b/org.tizen.ug-lockscreen-options-1.0.0-aarch64.tpk differ

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-arm-debug.tpk b/org.tizen.ug-lockscreen-options-1.0.0-arm-debug.tpk
index a97a16ab07086431113c7207a1ed3ffddac505ea..33cb44fe8c965c2f77271f226edfadb5f05fa5db 100644 (file)
Binary files a/org.tizen.ug-lockscreen-options-1.0.0-arm-debug.tpk and b/org.tizen.ug-lockscreen-options-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-arm.tpk b/org.tizen.ug-lockscreen-options-1.0.0-arm.tpk
index 579053d90c423f65979c0a835ec8cf290230c2ea..64cb3ccf9ddd8adf40d88fd1fde0c5259b466296 100644 (file)
Binary files a/org.tizen.ug-lockscreen-options-1.0.0-arm.tpk and b/org.tizen.ug-lockscreen-options-1.0.0-arm.tpk differ

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-i386-debug.tpk b/org.tizen.ug-lockscreen-options-1.0.0-i386-debug.tpk
index 9b9fdc12a4559ec72379447719962d28dcb92a8f..c20292a4f0cf2bc89bd1a217dec7d58359ee4164 100644 (file)
Binary files a/org.tizen.ug-lockscreen-options-1.0.0-i386-debug.tpk and b/org.tizen.ug-lockscreen-options-1.0.0-i386-debug.tpk differ

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-i386.tpk b/org.tizen.ug-lockscreen-options-1.0.0-i386.tpk
index 24d41b2fabcacd1dd3c4779e85b50e29aa7b0d36..1743209ab80d4f5ff0669e004fe98dbf09bac7ec 100644 (file)
Binary files a/org.tizen.ug-lockscreen-options-1.0.0-i386.tpk and b/org.tizen.ug-lockscreen-options-1.0.0-i386.tpk differ

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-x86_64-debug.tpk b/org.tizen.ug-lockscreen-options-1.0.0-x86_64-debug.tpk
new file mode 100644 (file)
index 0000000..95faf96
Binary files /dev/null and b/org.tizen.ug-lockscreen-options-1.0.0-x86_64-debug.tpk differ

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-x86_64.tpk b/org.tizen.ug-lockscreen-options-1.0.0-x86_64.tpk
new file mode 100644 (file)
index 0000000..06ac42f
Binary files /dev/null and b/org.tizen.ug-lockscreen-options-1.0.0-x86_64.tpk differ

diff --git a/packaging/org.tizen.ug-lockscreen-options.spec b/packaging/org.tizen.ug-lockscreen-options.spec
index f8ba2937ae2b392bbf4841bd6b6e5a0d62d478e2..cf85e5ff052fe5952e237c649fb3a07041a9b4d8 100644 (file)
--- a/packaging/org.tizen.ug-lockscreen-options.spec
+++ b/packaging/org.tizen.ug-lockscreen-options.spec
@@ -1,14 +1,14 @@
 Name:       org.tizen.ug-lockscreen-options
-#VCS_FROM:   profile/mobile/apps/native/ug-lockscreen-setting-efl#b853b596fe34eaa3e3329f5a7de7619c7c010bb7
-#RS_Ver:    20161101_1 
+#VCS_FROM:   profile/mobile/apps/native/ug-lockscreen-setting-efl#f76dd4e9330ff89d3efc35cb2a43cb2591540022
+#RS_Ver:    20170224_2 
 Summary:    Settings of lockscreen-application
 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-lockscreen-setting-efl#b853b596fe34eaa3e3329f5a7de7619c7c010bb7
+profile/mobile/apps/native/ug-lockscreen-setting-efl#f76dd4e9330ff89d3efc35cb2a43cb2591540022
 This is a container package which have preload TPK files
 
 %prep