[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 11cc35c..5d4eaec 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 fec8972..c85ed2d 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 a45460a..43db58d 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 6c93eb0..41e4796 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-x86-debug.tpk
similarity index 50%
rename from org.tizen.gallery-1.0.0-i386-debug.tpk
rename to org.tizen.gallery-1.0.0-x86-debug.tpk
index 595f42b..b50cd0d 100644 (file)
Binary files a/org.tizen.gallery-1.0.0-i386-debug.tpk and b/org.tizen.gallery-1.0.0-x86-debug.tpk differ

diff --git a/org.tizen.gallery-1.0.0-i386.tpk b/org.tizen.gallery-1.0.0-x86.tpk
similarity index 63%
rename from org.tizen.gallery-1.0.0-i386.tpk
rename to org.tizen.gallery-1.0.0-x86.tpk
index e3b6039..68022cc 100644 (file)
Binary files a/org.tizen.gallery-1.0.0-i386.tpk 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 6f88556..1671050 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 72cc4d4..855d79a 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 fe658ab..3ce5a9b 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