From 22fb7dbbe278fa7ed4b31fdd8b34c785848e7ead Mon Sep 17 00:00:00 2001
From: Alex Wu <zhiwen.wu@linux.intel.com>
Date: Tue, 28 Jan 2014 15:29:26 +0800
Subject: [PATCH] Add default manifest for compatible with Tizen 3.0 3 Domains
 style.

Remove the Tizen 2.0 manitest and rule file.

Change-Id: I5493fab3752ff3e27c6ed6fb346efc13031db8d4
Signed-off-by: Alex Wu <zhiwen.wu@linux.intel.com>
---
 CMakeLists.txt                          |  3 ---
 org.tizen.calculator.manifest           | 12 ------------
 packaging/org.tizen.calculator.manifest |  5 +++++
 packaging/org.tizen.calculator.spec     |  3 ++-
 4 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 org.tizen.calculator.manifest
 create mode 100644 packaging/org.tizen.calculator.manifest

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f83a399..0f0eb23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,3 @@ ADD_SUBDIRECTORY(po)
 set(PREFIX ${CMAKE_INSTALL_PREFIX})
 install(FILES ${CMAKE_SOURCE_DIR}/org.tizen.calculator.xml DESTINATION /usr/share/packages)
 install(FILES ${CMAKE_SOURCE_DIR}/org.tizen.calculator.png DESTINATION  /usr/share/icons/default/small)
-
-# rule file
-install(FILES ${CMAKE_SOURCE_DIR}/org.tizen.calculator.rule DESTINATION  /opt/etc/smack/accesses.d/)
diff --git a/org.tizen.calculator.manifest b/org.tizen.calculator.manifest
deleted file mode 100644
index 1abf8c5..0000000
--- a/org.tizen.calculator.manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-<manifest>
-	<define>
-		<domain name="org.tizen.calculator" />
-	</define>
-	<assign>
-		<filesystem path="/usr/share/applications/org.tizen.calculator.desktop" label="_" />
-		<filesystem path="/usr/share/icons/default/small/org.tizen.calculator.png" label="_" />
-	</assign>
-	<request>
-		<domain name="org.tizen.calculator" />
-	</request>
-</manifest>
diff --git a/packaging/org.tizen.calculator.manifest b/packaging/org.tizen.calculator.manifest
new file mode 100644
index 0000000..017d22d
--- /dev/null
+++ b/packaging/org.tizen.calculator.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>
diff --git a/packaging/org.tizen.calculator.spec b/packaging/org.tizen.calculator.spec
index b9f3792..657685b 100644
--- a/packaging/org.tizen.calculator.spec
+++ b/packaging/org.tizen.calculator.spec
@@ -6,6 +6,7 @@ Release:    1
 Summary: SLP Calculator application
 URL: http://slp-source.sec.samsung.net
 Source: %{name}-%{version}.tar.gz
+Source1001: org.tizen.calculator.manifest
 License: TIZEN
 Group: tizen/Application
 BuildRequires: cmake
@@ -27,6 +28,7 @@ SLP Calculator application
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 
@@ -42,7 +44,6 @@ rm -rf %{buildroot}
 
 %files
 %manifest org.tizen.calculator.manifest
-/opt/etc/smack/accesses.d/org.tizen.calculator.rule
 %defattr(-,root,root,-)
 %attr(-,inhouse,inhouse)
 /usr/apps/org.tizen.calculator/bin/calculator
-- 
2.7.4