Add manifest to the spec file

The manifest is added to the spec file.
This points out that there are illegal characters in the
manifest file, so those are corrected too.

Change-Id: Iebea7e6ebcaef549e5300803e0140754a232b26d
Signed-off-by: Casey Schaufler <casey.schaufler@intel.com>

diff --git a/packaging/filesystem.manifest b/packaging/filesystem.manifest
index ec4253b..36d435c 100644 (file)
--- a/packaging/filesystem.manifest
+++ b/packaging/filesystem.manifest
@@ -3,7 +3,7 @@
     <domain name="_"/>
  </request>
  <assign>
-    <filesystem path=”/etc” label=”System::Shared” type=”transmutable”/>
-    <filesystem path=”/var/log” label=”System::Log” type=”transmutable”/>
+    <filesystem path="/etc" label="System::Shared" type="transmutable" />
+    <filesystem path="/var/log" label="System::Log" type="transmutable" />
  </assign>
 </manifest>

diff --git a/packaging/filesystem.spec b/packaging/filesystem.spec
index 0577a72..0dfee2e 100644 (file)
--- a/packaging/filesystem.spec
+++ b/packaging/filesystem.spec
@@ -10,7 +10,7 @@ Group:          Base/Configuration
 Requires(pre): setup
 Source2:        languages
 Source3:        languages.man
-
+Source1001:     %{name}.manifest
 
 %description
 The filesystem package is one of the basic packages that is installed
@@ -22,6 +22,7 @@ the directories.
 rm -f $RPM_BUILD_DIR/filelist
 
 %build
+cp %{SOURCE1001} .
 
 %install
 function create_dir () {
@@ -104,6 +105,7 @@ posix.symlink("/opt/home/app", "/home/app")
 posix.symlink("/opt/home/developer", "/home/developer")
 
 %files -f filelist
+%manifest %{name}.manifest
 %defattr(0755,root,root,-)
 %dir %attr(555,root,root)
 /bin