Fix manifests

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

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

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

diff --git a/packaging/sys-assert.spec b/packaging/sys-assert.spec
index 609db4d0ae51af8b69127212c604beda70573b54..a32e246a58b38d5ed927abf757dcf4260b7f156a 100644 (file)
--- a/packaging/sys-assert.spec
+++ b/packaging/sys-assert.spec
@@ -5,6 +5,7 @@ Release:    5
 Group:      System/Debug
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
+Source1001:    %{name}.manifest
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  cmake
 
@@ -13,6 +14,7 @@ System Assert.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 export CFLAGS+=" -fPIC"
@@ -43,7 +45,7 @@ end
 #
 
 %files
-%manifest sys-assert.manifest
+%manifest %{name}.manifest
 %attr(775,root,crash) /opt/share/crash
 %attr(775,root,crash) /opt/share/crash/info
 %license LICENSE.APLv2

diff --git a/sys-assert.manifest b/sys-assert.manifest
deleted file mode 100644 (file)
index dd287d6..0000000
--- a/sys-assert.manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-<manifest>
-       <define>
-               <domain name="sys-assert"/>
-               <provide>
-                       <label name="sys-assert::core"/>
-               </provide>
-       </define>
-       <request>
-               <domain name="sys-assert"/>
-       </request>
-       <assign>
-               <filesystem path="/usr/lib/libsys-assert.so" label="_" exec_label="none"/>
-               <filesystem path="/etc/ld.so.preload" label="_" exec_label="none"/>
-               <filesystem path="/usr/bin/coredumpctrl.sh" label="_" exec_label="none"/>
-               <filesystem path="/opt/etc/.debugmode" label="_" exec_label="none"/>
-       </assign>
-</manifest>