Fix manifests

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

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

diff --git a/epson-inkjet-printer-escpr.manifest b/epson-inkjet-printer-escpr.manifest
deleted file mode 100644 (file)
index 9ed9d1b..0000000
--- a/epson-inkjet-printer-escpr.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-<manifest>
-       <request>
-               <domain name="mobileprint"/>
-       </request>
-       <assign>
-               <filesystem path="/usr/lib/libescpr.so" label="_" exec_label="_" />
-               <filesystem path="/usr/lib/libescpr.so.1" label="_" exec_label="_" />
-               <filesystem path="/usr/lib/libescpr.so.1.0.0" label="_" exec_label="_" />
-       </assign>
-</manifest>

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

diff --git a/packaging/epson-inkjet-printer-escpr.spec b/packaging/epson-inkjet-printer-escpr.spec
index cdeb38a..bca9074 100644 (file)
--- a/packaging/epson-inkjet-printer-escpr.spec
+++ b/packaging/epson-inkjet-printer-escpr.spec
@@ -24,6 +24,7 @@ Name: epson-inkjet-printer-escpr
 Version: 1.2.2
 Release: 3
 Source0: %{name}-%{version}.tar.gz
+Source1001:    %{name}.manifest
 License: GPL
 Vendor: Seiko Epson Corporation
 URL: http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
@@ -51,6 +52,7 @@ http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -80,7 +82,7 @@ make clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%manifest epson-inkjet-printer-escpr.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root)
 #%doc AUTHORS COPYING NEWS README README.ja
 /usr/share/license/%{name}

diff --git a/packaging/epson-inkjet-printer-escpr.spec.manifest b/packaging/epson-inkjet-printer-escpr.spec.manifest
deleted file mode 100644 (file)
index 017d22d..0000000
--- a/packaging/epson-inkjet-printer-escpr.spec.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
- <request>
-    <domain name="_"/>
- </request>
-</manifest>