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

Reference: submit/tizen/20170224.073448
Commit id: 52f8ade45890b75d5dca9877b80891a2b3033192
Requested by: gen.azarov@samsung.com
SDK rootstrap version: 20170223_3

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

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

diff --git a/org.tizen.wallpaper-ui-service-1.0.0-arm-debug.tpk b/org.tizen.wallpaper-ui-service-1.0.0-arm-debug.tpk
index e6ccc0d48e605b4c78a29b879b1a3c0298a989a1..ddf92d551d8fef5e4a0e42c965905a470f0555e3 100644 (file)
Binary files a/org.tizen.wallpaper-ui-service-1.0.0-arm-debug.tpk and b/org.tizen.wallpaper-ui-service-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.wallpaper-ui-service-1.0.0-arm.tpk b/org.tizen.wallpaper-ui-service-1.0.0-arm.tpk
index 6647b504532aa1da49ed164843ff92d0df439036..3d689e6aebca3f2168f1b02a3ebcff65477c6209 100644 (file)
Binary files a/org.tizen.wallpaper-ui-service-1.0.0-arm.tpk and b/org.tizen.wallpaper-ui-service-1.0.0-arm.tpk differ

diff --git a/org.tizen.wallpaper-ui-service-1.0.0-i386-debug.tpk b/org.tizen.wallpaper-ui-service-1.0.0-i386-debug.tpk
index f29ee1165e8b5ba408e256419707566e27f85bf3..e8a46967fce956426fa288e3da778ffc9028c051 100644 (file)
Binary files a/org.tizen.wallpaper-ui-service-1.0.0-i386-debug.tpk and b/org.tizen.wallpaper-ui-service-1.0.0-i386-debug.tpk differ

diff --git a/org.tizen.wallpaper-ui-service-1.0.0-i386.tpk b/org.tizen.wallpaper-ui-service-1.0.0-i386.tpk
index abc09c320c52dad5caff763eb60d5f9ff6239d3b..b750d9fee3ec66aa09e35eb70c8641b55e1ac3ba 100644 (file)
Binary files a/org.tizen.wallpaper-ui-service-1.0.0-i386.tpk and b/org.tizen.wallpaper-ui-service-1.0.0-i386.tpk differ

diff --git a/org.tizen.wallpaper-ui-service-1.0.0-x86_64-debug.tpk b/org.tizen.wallpaper-ui-service-1.0.0-x86_64-debug.tpk
new file mode 100644 (file)
index 0000000..c9f0ccb
Binary files /dev/null and b/org.tizen.wallpaper-ui-service-1.0.0-x86_64-debug.tpk differ

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

diff --git a/packaging/org.tizen.wallpaper-ui-service.spec b/packaging/org.tizen.wallpaper-ui-service.spec
index dbe4b23a5c4a475cab4c909ec3d15a1a480b5f04..43933273436eb566a77b8c0f685f2487adf363ad 100644 (file)
--- a/packaging/org.tizen.wallpaper-ui-service.spec
+++ b/packaging/org.tizen.wallpaper-ui-service.spec
@@ -1,14 +1,14 @@
 Name:       org.tizen.wallpaper-ui-service
-#VCS_FROM:   profile/mobile/apps/native/wallpaper-ui-service#a181a82810910e9faacce423b2b783f499f45164
-#RS_Ver:    20161101_1 
+#VCS_FROM:   profile/mobile/apps/native/wallpaper-ui-service#52f8ade45890b75d5dca9877b80891a2b3033192
+#RS_Ver:    20170223_3 
 Summary:    wallpaper-ui-service window
 Version:    1.0.0
 Release:    1
 Group:      utils
-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/wallpaper-ui-service#a181a82810910e9faacce423b2b783f499f45164
+profile/mobile/apps/native/wallpaper-ui-service#52f8ade45890b75d5dca9877b80891a2b3033192
 This is a container package which have preload TPK files
 
 %prep