From d0f27e83e6fd1fe475b3ee8cb555bcb68aec36fe Mon Sep 17 00:00:00 2001
From: Michael Leibowitz <michael.leibowitz@intel.com>
Date: Wed, 17 Jul 2013 14:21:30 -0700
Subject: [PATCH] Fix manifests

put manifests in packaging/
consistent use of %{name} macros

Change-Id: Iba2c88c23ff886c3c97305e8a33a678ab71772dd
Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>
---
 libpush.manifest                 |  9 ---------
 packaging/libpush-devel.manifest |  5 +++++
 packaging/libpush.manifest       |  5 +++++
 packaging/push-bin.manifest      |  5 +++++
 packaging/push-tool.manifest     |  5 +++++
 packaging/push.manifest          |  6 +++---
 packaging/push.spec              | 15 +++++++++------
 push-bin.manifest                | 26 --------------------------
 push-tool.manifest               |  5 -----
 9 files changed, 32 insertions(+), 49 deletions(-)
 delete mode 100644 libpush.manifest
 create mode 100644 packaging/libpush-devel.manifest
 create mode 100644 packaging/libpush.manifest
 create mode 100644 packaging/push-bin.manifest
 create mode 100644 packaging/push-tool.manifest
 delete mode 100644 push-bin.manifest
 delete mode 100644 push-tool.manifest

diff --git a/libpush.manifest b/libpush.manifest
deleted file mode 100644
index f2b785f..0000000
--- a/libpush.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-<manifest>
-	<request>
-		<domain name="_"/>
-	</request>
-        <assign>
-                <filesystem path="/usr/lib/libpush.so.0.2.12" label="_"/>
-                <filesystem path="/usr/lib/libpush.so.0" label="_"/>
-        </assign>
-</manifest>
diff --git a/packaging/libpush-devel.manifest b/packaging/libpush-devel.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/libpush-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/packaging/libpush.manifest b/packaging/libpush.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/libpush.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/packaging/push-bin.manifest b/packaging/push-bin.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/push-bin.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/packaging/push-tool.manifest b/packaging/push-tool.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/push-tool.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/packaging/push.manifest b/packaging/push.manifest
index 017d22d..c00c25b 100644
--- a/packaging/push.manifest
+++ b/packaging/push.manifest
@@ -1,5 +1,5 @@
 <manifest>
- <request>
-    <domain name="_"/>
- </request>
+        <request>
+                <domain name="_" />
+        </request>
 </manifest>
diff --git a/packaging/push.spec b/packaging/push.spec
index 0a132da..5963809 100755
--- a/packaging/push.spec
+++ b/packaging/push.spec
@@ -5,7 +5,10 @@ Release:    3
 Group:      Application Framwork/Service
 License:    Flora
 Source0:    %{name}-%{version}.tar.gz
-Source1001: 	push.manifest
+Source1001:	libpush.manifest
+Source1002:	libpush-devel.manifest
+Source1003:	%{name}-bin.manifest
+Source1004:	%{name}-tool.manifest
 
 
 %description
@@ -52,7 +55,7 @@ Push service tool
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
+cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} .
 
 %build
 
@@ -155,17 +158,17 @@ vconftool set -t int    file/private/push-bin/port_sec -1 ${_GRP} -f
 
 
 %files -n libpush
-%manifest %{name}.manifest
+%manifest libpush.manifest
 %attr(644,-,-) %{_libdir}/libpush.so.*
 
 %files -n libpush-devel
-%manifest %{name}.manifest
+%manifest libpush-devel.manifest
 %attr(644,-,-) %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libpush.so
 
 %files bin
-%manifest %{name}.manifest
+%manifest %{name}-bin.manifest
 %{_bindir}/pushd
 /usr/share/push/*.cer
 /etc/init.d/pushd
@@ -175,7 +178,7 @@ vconftool set -t int    file/private/push-bin/port_sec -1 ${_GRP} -f
 /usr/lib/systemd/user/tizen-middleware.target.wants/pushd.service
 
 %files tool
-%manifest %{name}.manifest
+%manifest %{name}-tool.manifest
 %{_bindir}/push_tool
 
 %changelog
diff --git a/push-bin.manifest b/push-bin.manifest
deleted file mode 100644
index 3f6e143..0000000
--- a/push-bin.manifest
+++ /dev/null
@@ -1,26 +0,0 @@
-<manifest>
-	<define> 
-		<domain name="push-service" policy="restricted" plist="push-bin,push-tool,libpush"/>
-		 <request>
-                        <smack request="system::use_internet" type="rw"/>
-                        <smack request="sys-assert::core" type="rwxat"/>
-		</request>
-		<permit>
-                        <smack permit="system::use_internet" type="w"/>
-						<smack permit="dbus" type="rx"/>
-		</permit>
-		<provide>
-			<label name="push-service::db"/>
-		</provide>
-	</define> 
-	<request>
-		<domain name="push-service"/>
-	</request>
-	<assign>
-		<filesystem path="/etc/init.d/pushd" label="_" exec_label="none"/>
-		<filesystem path="/etc/rc.d/rc3.d/S90pushd" label="_" exec_label="none"/>
-		<filesystem path="/etc/rc.d/rc5.d/S90pushd" label="_" exec_label="none"/>
-		<filesystem path="/usr/lib/systemd/user/pushd.service" label="_" exec_label="none" />
-		<filesystem path="/usr/lib/systemd/user/tizen-middleware.target.wants/pushd.service" label="_" exec_label="none" />
-	</assign>
-</manifest>
diff --git a/push-tool.manifest b/push-tool.manifest
deleted file mode 100644
index 367275f..0000000
--- a/push-tool.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-	<request>
-		<domain name="push-service"/>
-	</request>
-</manifest>
-- 
2.7.4