[ABS] Merging code from tizen_3.0 branch

Reference: submit/tizen/20170321.023915
Commit id: 7d2dd43219a63eaeb4782d19462aff99b43271fb
Requested by: r.dadhich@samsung.com
SDK rootstrap version: 20170320_2

diff --git a/org.tizen.videos-1.0.0-aarch64-debug.tpk b/org.tizen.videos-1.0.0-aarch64-debug.tpk
index 4939421b1ded326d109209e33e705a9bdcfc776f..e20ee27a8987737bd0afc58615b5a95d9f49ea40 100644 (file)
Binary files a/org.tizen.videos-1.0.0-aarch64-debug.tpk and b/org.tizen.videos-1.0.0-aarch64-debug.tpk differ

diff --git a/org.tizen.videos-1.0.0-aarch64.tpk b/org.tizen.videos-1.0.0-aarch64.tpk
index 0bbf80c5970aac9853a4f13940e8d7e7796cfb99..a45f1bcbf83772d85bd9dc8d85d1423fa7684c84 100644 (file)
Binary files a/org.tizen.videos-1.0.0-aarch64.tpk and b/org.tizen.videos-1.0.0-aarch64.tpk differ

diff --git a/org.tizen.videos-1.0.0-arm-debug.tpk b/org.tizen.videos-1.0.0-arm-debug.tpk
index 2868778b870fb9ce7f3aa0ab5a1f80ea567f7ab5..1309a842a554f42ad05d2e5537c2ba383ce769be 100644 (file)
Binary files a/org.tizen.videos-1.0.0-arm-debug.tpk and b/org.tizen.videos-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.videos-1.0.0-arm.tpk b/org.tizen.videos-1.0.0-arm.tpk
index 22231b85f0d203920dcc23da083009515930c51e..e2194ea2b174e2f27022dde3dfba7db5c7dd0f18 100644 (file)
Binary files a/org.tizen.videos-1.0.0-arm.tpk and b/org.tizen.videos-1.0.0-arm.tpk differ

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

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

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

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

diff --git a/org.tizen.videos-1.0.0-x86_64-debug.tpk b/org.tizen.videos-1.0.0-x86_64-debug.tpk
index 5f9545c39dc7756433e06a85b065ab832ec388f9..a4ffdd949fc94f03b1e231fb3904dff377ee2cf8 100644 (file)
Binary files a/org.tizen.videos-1.0.0-x86_64-debug.tpk and b/org.tizen.videos-1.0.0-x86_64-debug.tpk differ

diff --git a/org.tizen.videos-1.0.0-x86_64.tpk b/org.tizen.videos-1.0.0-x86_64.tpk
index f486bc116bea1d7397cdd41928798678a57a89a4..e9c2ffb0330f1a826c793f9bb4255c9af9f22551 100644 (file)
Binary files a/org.tizen.videos-1.0.0-x86_64.tpk and b/org.tizen.videos-1.0.0-x86_64.tpk differ

diff --git a/packaging/org.tizen.videos.spec b/packaging/org.tizen.videos.spec
index 3cd252dbf27cb8dd6f8e0821068bda930f9de307..4b8568b150bc9d7c1dc7b6c559f26ff6b50f905c 100644 (file)
--- a/packaging/org.tizen.videos.spec
+++ b/packaging/org.tizen.videos.spec
@@ -1,6 +1,6 @@
 Name:       org.tizen.videos
-#VCS_FROM:   profile/mobile/apps/native/video-player#cb0bf288eac6566e8e3769a73e98e857d99d0dda
-#RS_Ver:    20161228_1 
+#VCS_FROM:   profile/mobile/apps/native/video-player#7d2dd43219a63eaeb4782d19462aff99b43271fb
+#RS_Ver:    20170320_2 
 Summary:    video library & store
 Version:    1.0.0
 Release:    1
@@ -8,6 +8,7 @@ Group:      Applications
 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/video-player#cb0bf288eac6566e8e3769a73e98e857d99d0dda
+profile/mobile/apps/native/video-player#7d2dd43219a63eaeb4782d19462aff99b43271fb
 This is a container package which have preload TPK files
 
 %prep