Fix manifests

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

Change-Id: Ief38ce6c86f7c8bfe435ef58cff47f12628cef78
Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>

7 files changed, 25 insertions, 28 deletions

diff --git a/libss-client.manifest b/libss-client.manifest
deleted file mode 100644
index 97e8c31..0000000
--- a/libss-client.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-	<request>
-		<domain name="_"/>
-	</request>
-</manifest>
diff --git a/packaging/libss-client-devel.manifest b/packaging/libss-client-devel.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/libss-client-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/packaging/libss-client.manifest b/packaging/libss-client.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/libss-client.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/packaging/secure-storage.manifest b/packaging/secure-storage.manifest
index 017d22d..c00c25b 100644
--- a/packaging/secure-storage.manifest
+++ b/packaging/secure-storage.manifest
@@ -1,5 +1,5 @@
 <manifest>
- <request>
-    <domain name="_"/>
- </request>
+        <request>
+                <domain name="_" />
+        </request>
 </manifest>
diff --git a/packaging/secure-storage.spec b/packaging/secure-storage.spec
index 510c44f..d416a0e 100644
--- a/packaging/secure-storage.spec
+++ b/packaging/secure-storage.spec
@@ -6,7 +6,9 @@ Group:      System/Security
 License:    Apache 2.0
 Source0:    secure-storage-%{version}.tar.gz
 Source1:    secure-storage.service
-Source1001: 	secure-storage.manifest
+Source1001:	libss-client.manifest
+Source1002:	libss-client-devel.manifest
+Source1003:	ss-server.manifest
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(dlog)
 #BuildRequires:  pkgconfig(libsystemd-daemon)
@@ -46,7 +48,7 @@ Secure storage package (ss-server)
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
+cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} .
 
 
 %build
@@ -90,7 +92,7 @@ systemctl daemon-reload
 %postun -n libss-client -p /sbin/ldconfig
 
 %files -n ss-server
-%manifest %{name}.manifest
+%manifest ss-server.manifest
 %defattr(-,root,root,-)
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/ss-serverd
 %{_sysconfdir}/rc.d/rc3.d/S40ss-server
@@ -102,13 +104,13 @@ systemctl daemon-reload
 /usr/share/license/ss-server
 
 %files -n libss-client
-%manifest %{name}.manifest
+%manifest libss-client.manifest
 %defattr(-,root,root)
 %{_libdir}/libss-client.so.*
 /usr/share/license/libss-client
 
 %files -n libss-client-devel
-%manifest %{name}.manifest
+%manifest libss-client-devel.manifest
 %defattr(-,root,root,-)
 %{_includedir}/ss_manager.h
 %{_libdir}/pkgconfig/secure-storage.pc
diff --git a/packaging/ss-server.manifest b/packaging/ss-server.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/ss-server.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/ss-server.manifest b/ss-server.manifest
deleted file mode 100644
index a685c55..0000000
--- a/ss-server.manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-<manifest>
-	<define>
-		<domain name="secure-storage"/>
-	</define>
-	<request>
-		<domain name="secure-storage"/>
-	</request>
-	<assign>
-		<filesystem path="/etc/rc.d/init.d/ss-serverd" label="_" exec_label="none" />
-		<filesystem path="/etc/rc.d/rc3.d/S40ss-server" label="_" exec_label="none" />
-		<filesystem path="/etc/rc.d/rc5.d/S40ss-server" label="_" exec_label="none" />
-		<filesystem path="/usr/lib/systemd/system/secure-storage.service" label="_" exec_label="none" />
-		<filesystem path="/usr/lib/systemd/system/multi-user.target.wants/secure-storage.service" label="_" exec_label="none" />
-	</assign>
-</manifest>