Fix manifests

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

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

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

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

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

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

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 7d425d9..f181f34 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -6,7 +6,9 @@ Group:      Multimedia/Service
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    media-server.service
-Source1001:    media-server.manifest
+Source1001:    %{name}.manifest
+Source1002:    libmedia-utils.manifest
+Source1003:    libmedia-utils-devel.manifest
 
 Requires(post): /usr/bin/vconftool
 BuildRequires:  pkgconfig(glib-2.0)
@@ -42,7 +44,7 @@ Description: media server development library.
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
+cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} .
 
 %build
 
@@ -71,7 +73,6 @@ vconftool set -t int file/private/mediaserver/scan_directory "1" -f
 
 %files
 %manifest %{name}.manifest
-#%manifest media-server.manifest
 %defattr(-,root,root,-)
 %{_bindir}/media-server
 %{_bindir}/media-scanner
@@ -85,15 +86,14 @@ vconftool set -t int file/private/mediaserver/scan_directory "1" -f
 
 
 %files -n libmedia-utils
-%manifest %{name}.manifest
+%manifest libmedia-utils.manifest
 %license LICENSE.APLv2.0
-#%manifest libmedia-utils.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libmedia-utils.so.0
 %{_libdir}/libmedia-utils.so.0.0.0
 
 %files -n libmedia-utils-devel
-%manifest %{name}.manifest
+%manifest libmedia-utils-devel.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libmedia-utils.so
 %{_libdir}/pkgconfig/libmedia-utils.pc