[ABS] Merge branch 'tizen_dev' into tizen

Reference: submit/tizen/20161221.134833
Commit id: 17bf1f35f3dd3e15ccddc2cd0f85a561d24386fa
Requested by: a.sapozhnik@samsung.com
SDK rootstrap version: 20161221_3

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

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

diff --git a/org.tizen.calendar-1.0.0-arm-debug.tpk b/org.tizen.calendar-1.0.0-arm-debug.tpk
index 685f3cd..0c485a5 100644 (file)
Binary files a/org.tizen.calendar-1.0.0-arm-debug.tpk and b/org.tizen.calendar-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.calendar-1.0.0-arm.tpk b/org.tizen.calendar-1.0.0-arm.tpk
index 932c097..f0cfcaf 100644 (file)
Binary files a/org.tizen.calendar-1.0.0-arm.tpk and b/org.tizen.calendar-1.0.0-arm.tpk differ

diff --git a/org.tizen.calendar-1.0.0-i386-debug.tpk b/org.tizen.calendar-1.0.0-i386-debug.tpk
index 9ff3318..9618a3f 100644 (file)
Binary files a/org.tizen.calendar-1.0.0-i386-debug.tpk and b/org.tizen.calendar-1.0.0-i386-debug.tpk differ

diff --git a/org.tizen.calendar-1.0.0-i386.tpk b/org.tizen.calendar-1.0.0-i386.tpk
index 3630816..27accac 100644 (file)
Binary files a/org.tizen.calendar-1.0.0-i386.tpk and b/org.tizen.calendar-1.0.0-i386.tpk differ

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

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

diff --git a/packaging/org.tizen.calendar.spec b/packaging/org.tizen.calendar.spec
index a57401a..dbb79e8 100644 (file)
--- a/packaging/org.tizen.calendar.spec
+++ b/packaging/org.tizen.calendar.spec
@@ -1,14 +1,14 @@
 Name:       org.tizen.calendar
-#VCS_FROM:   profile/mobile/apps/native/calendar#164fe81c278bf76f626b72194e0c5f74cc5e0e7a
-#RS_Ver:    20161025_2 
+#VCS_FROM:   profile/mobile/apps/native/calendar#17bf1f35f3dd3e15ccddc2cd0f85a561d24386fa
+#RS_Ver:    20161221_3 
 Summary:    %{REF_APP_LABEL} application
 Version:    1.0.0
 Release:    1
 Group:      Applications/PIM
-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/calendar#164fe81c278bf76f626b72194e0c5f74cc5e0e7a
+profile/mobile/apps/native/calendar#17bf1f35f3dd3e15ccddc2cd0f85a561d24386fa
 This is a container package which have preload TPK files
 
 %prep