Fix manifests

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

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

diff --git a/packaging/smartcard-service-common-devel.manifest b/packaging/smartcard-service-common-devel.manifest
new file mode 100644 (file)
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/smartcard-service-common-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>

diff --git a/packaging/smartcard-service-common.manifest b/packaging/smartcard-service-common.manifest
new file mode 100644 (file)
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/smartcard-service-common.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>

diff --git a/packaging/smartcard-service-devel.manifest b/packaging/smartcard-service-devel.manifest
new file mode 100644 (file)
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/smartcard-service-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>

diff --git a/packaging/smartcard-service-server.manifest b/packaging/smartcard-service-server.manifest
new file mode 100644 (file)
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/smartcard-service-server.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>

diff --git a/packaging/smartcard-service.manifest b/packaging/smartcard-service.manifest
index 017d22d..c00c25b 100644 (file)
--- a/packaging/smartcard-service.manifest
+++ b/packaging/smartcard-service.manifest
@@ -1,5 +1,5 @@
 <manifest>
- <request>
-    <domain name="_"/>
- </request>
+        <request>
+                <domain name="_" />
+        </request>
 </manifest>

diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec
index c52045b..cb579db 100644 (file)
--- a/packaging/smartcard-service.spec
+++ b/packaging/smartcard-service.spec
@@ -5,8 +5,12 @@ Release:    1
 Group:      libs
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    smartcard-service.manifest
 #Source1:    smartcard-service-server.init
+Source1001:    %{name}.manifest
+Source1002:    %{name}-devel.manifest
+Source1003:    smartcard-service-common.manifest
+Source1004:    smartcard-service-common-devel.manifest
+Source1005:    smartcard-service-server.manifest
 
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(security-server)
@@ -29,7 +33,7 @@ Smartcard Service FW.
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
+cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} %{SOURCE1005} .
 
 %package    devel
 Summary:    Smartcard service
@@ -101,26 +105,26 @@ rm -f /etc/rc.d/rc5.d/S79smartcard-service-server
 %{_libdir}/libsmartcard-service.so.*
 
 %files  devel
-%manifest %{name}.manifest
+%manifest %{name}-devel.manifest
 %defattr(-,root,root,-)
 %{_includedir}/smartcard-service/*
 %{_libdir}/libsmartcard-service.so
 %{_libdir}/pkgconfig/smartcard-service.pc
 
 %files -n smartcard-service-common
-%manifest %{name}.manifest
+%manifest smartcard-service-common.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libsmartcard-service-common.so.*
 
 %files -n smartcard-service-common-devel
-%manifest %{name}.manifest
+%manifest smartcard-service-common-devel.manifest
 %defattr(-,root,root,-)
 %{_includedir}/smartcard-service-common/*
 %{_libdir}/libsmartcard-service-common.so
 %{_libdir}/pkgconfig/smartcard-service-common.pc
 
 %files -n smartcard-service-server
-%manifest %{name}.manifest
+%manifest smartcard-service-server.manifest
 %defattr(-,root,root,-)
 %{_bindir}/smartcard-daemon
 /usr/share/dbus-1/services/org.tizen.smartcard_service.service

diff --git a/smartcard-service-common-devel.manifest b/smartcard-service-common-devel.manifest
deleted file mode 100644 (file)
index ca37499..0000000
--- a/smartcard-service-common-devel.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_" />
-       </request>
-</manifest>
-

diff --git a/smartcard-service-common.manifest b/smartcard-service-common.manifest
deleted file mode 100644 (file)
index ca37499..0000000
--- a/smartcard-service-common.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_" />
-       </request>
-</manifest>
-

diff --git a/smartcard-service-devel.manifest b/smartcard-service-devel.manifest
deleted file mode 100644 (file)
index ca37499..0000000
--- a/smartcard-service-devel.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_" />
-       </request>
-</manifest>
-

diff --git a/smartcard-service-server.manifest b/smartcard-service-server.manifest
deleted file mode 100644 (file)
index 780bc43..0000000
--- a/smartcard-service-server.manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-<manifest>
-       <define>
-               <domain name="smartcard-service" />
-               <request>
-                       <smack request="sys-assert::core" type="rwxat" />
-               </request>
-       </define>
-       <assign>
-               <filesystem path="/usr/bin/smartcard-daemon" exec_label="nfc-manager" />
-               <filesystem path="/usr/share/dbus-1/services/smartcard-service.service" label="_" />
-       </assign>
-       <request>
-               <domain name="smartcard-service" />
-       </request>
-</manifest>
-