[ABS] Merging code from tizen_3.0 branch

Reference: submit/tizen/20170321.023724
Commit id: 05f2b756af4292e046b427f7672163c323138cab
Requested by: r.dadhich@samsung.com
SDK rootstrap version: 20170320_2

diff --git a/org.tizen.gallery-1.0.0-aarch64-debug.tpk b/org.tizen.gallery-1.0.0-aarch64-debug.tpk
index 11cc35c0e6a9274ffbce65e06c58bea12992202c..5d4eaec32e5514dda9fa13127292e868f8d7ea80 100644 (file)
Binary files a/org.tizen.gallery-1.0.0-aarch64-debug.tpk and b/org.tizen.gallery-1.0.0-aarch64-debug.tpk differ

diff --git a/org.tizen.gallery-1.0.0-aarch64.tpk b/org.tizen.gallery-1.0.0-aarch64.tpk
index fec8972b9e96548018bbc385b218dae8b2dc3662..c85ed2df6ba9685e9a33d180670a7becfbb5b265 100644 (file)
Binary files a/org.tizen.gallery-1.0.0-aarch64.tpk and b/org.tizen.gallery-1.0.0-aarch64.tpk differ

diff --git a/org.tizen.gallery-1.0.0-arm-debug.tpk b/org.tizen.gallery-1.0.0-arm-debug.tpk
index a45460a04761b7f31ef7c6aff7252644de975963..43db58d72a67b0d94541d92e8b26134db5ae6e32 100644 (file)
Binary files a/org.tizen.gallery-1.0.0-arm-debug.tpk and b/org.tizen.gallery-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.gallery-1.0.0-arm.tpk b/org.tizen.gallery-1.0.0-arm.tpk
index 6c93eb0f25259c7fac1fb9edac282a268dfe8ef4..41e4796dcd404f4d30c7e21997d43965cdebcf89 100644 (file)
Binary files a/org.tizen.gallery-1.0.0-arm.tpk and b/org.tizen.gallery-1.0.0-arm.tpk differ

diff --git a/org.tizen.gallery-1.0.0-i386-debug.tpk b/org.tizen.gallery-1.0.0-i386-debug.tpk
deleted file mode 100644 (file)
index 595f42b..0000000
Binary files a/org.tizen.gallery-1.0.0-i386-debug.tpk and /dev/null differ

diff --git a/org.tizen.gallery-1.0.0-i386.tpk b/org.tizen.gallery-1.0.0-i386.tpk
deleted file mode 100644 (file)
index e3b6039..0000000
Binary files a/org.tizen.gallery-1.0.0-i386.tpk and /dev/null differ

diff --git a/org.tizen.gallery-1.0.0-x86-debug.tpk b/org.tizen.gallery-1.0.0-x86-debug.tpk
new file mode 100644 (file)
index 0000000..b50cd0d
Binary files /dev/null and b/org.tizen.gallery-1.0.0-x86-debug.tpk differ

diff --git a/org.tizen.gallery-1.0.0-x86.tpk b/org.tizen.gallery-1.0.0-x86.tpk
new file mode 100644 (file)
index 0000000..68022cc
Binary files /dev/null and b/org.tizen.gallery-1.0.0-x86.tpk differ

diff --git a/org.tizen.gallery-1.0.0-x86_64-debug.tpk b/org.tizen.gallery-1.0.0-x86_64-debug.tpk
index 6f885564629eb3f7071f921074e94ed264ba08d0..1671050c16d652745805ce5a5ec66321b4ec067e 100644 (file)
Binary files a/org.tizen.gallery-1.0.0-x86_64-debug.tpk and b/org.tizen.gallery-1.0.0-x86_64-debug.tpk differ

diff --git a/org.tizen.gallery-1.0.0-x86_64.tpk b/org.tizen.gallery-1.0.0-x86_64.tpk
index 72cc4d42177d189ba3474f8eaeb7b522a89136b0..855d79ade575710b34a66a00e71d1abf0057f157 100644 (file)
Binary files a/org.tizen.gallery-1.0.0-x86_64.tpk and b/org.tizen.gallery-1.0.0-x86_64.tpk differ

diff --git a/packaging/org.tizen.gallery.spec b/packaging/org.tizen.gallery.spec
index fe658ab3660d614845dea384b3bdb4362aa1cd89..3ce5a9bf814353ca0422aa2a8e7980aa1280dea7 100644 (file)
--- a/packaging/org.tizen.gallery.spec
+++ b/packaging/org.tizen.gallery.spec
@@ -1,13 +1,14 @@
 Name:       org.tizen.gallery
-#VCS_FROM:   profile/mobile/apps/native/gallery#7ee25461ad42f60e92878fb44d2a385a9b0e1f6d
-#RS_Ver:    20161111_1 
+#VCS_FROM:   profile/mobile/apps/native/gallery#05f2b756af4292e046b427f7672163c323138cab
+#RS_Ver:    20170320_2 
 Summary:    org.tizen.gallery UX
 Version:    1.0.0
 Release:    1
 Group:      Applications
-License:    Apache-2.0
+License:    Flora-1.1
 Source0:    %{name}-%{version}.tar.gz
 
+ExclusiveArch:  x86_64 i586 x86 aarch64 i486 i686 i386 armv7l arm
 
 BuildRequires:  pkgconfig(libtzplatform-config)
 Requires(post):  /usr/bin/tpk-backend
@@ -27,10 +28,10 @@ Requires(post):  /usr/bin/tpk-backend
 %define target x86_64
 %endif
 %ifarch i386 i486 i586 i686
-%define target i386
+%define target x86
 %endif
 %description
-profile/mobile/apps/native/gallery#7ee25461ad42f60e92878fb44d2a385a9b0e1f6d
+profile/mobile/apps/native/gallery#05f2b756af4292e046b427f7672163c323138cab
 This is a container package which have preload TPK files
 
 %prep