summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Leibowitz <michael.leibowitz@intel.com>2013-07-17 21:37:39 (GMT)
committerMichael Leibowitz <michael.leibowitz@intel.com>2013-07-17 21:37:39 (GMT)
commit3ef29c0f1ade956abe04068e6091d848cd176f7f (patch)
tree7de574c6f8073d05ae14e1e73861c023cc880932
parenta72bde17e6fb0af55df3fd5b4db22a635b9740f1 (diff)
downloadlibmedia-thumbnail-3ef29c0f1ade956abe04068e6091d848cd176f7f.zip
libmedia-thumbnail-3ef29c0f1ade956abe04068e6091d848cd176f7f.tar.gz
libmedia-thumbnail-3ef29c0f1ade956abe04068e6091d848cd176f7f.tar.bz2
put manifests in packaging/ consistent use of %{name} macros Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>
-rw-r--r--media-thumbnail-server.manifest9
-rw-r--r--packaging/libmedia-thumbnail-devel.manifest5
-rw-r--r--packaging/libmedia-thumbnail.manifest6
-rw-r--r--packaging/libmedia-thumbnail.spec10
-rw-r--r--packaging/media-thumbnail-server.manifest5
5 files changed, 19 insertions, 16 deletions
diff --git a/media-thumbnail-server.manifest b/media-thumbnail-server.manifest
deleted file mode 100644
index de4c6b8..0000000
--- a/media-thumbnail-server.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-<manifest>
- <request>
- <domain name="media-server"/>
- </request>
- <assign>
- <filesystem path="/usr/bin/media-thumbnail-server" label="media-server" exec_label="media-server"/>
- </assign>
-</manifest>
-
diff --git a/packaging/libmedia-thumbnail-devel.manifest b/packaging/libmedia-thumbnail-devel.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/libmedia-thumbnail-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+ <domain name="_" />
+ </request>
+</manifest>
diff --git a/packaging/libmedia-thumbnail.manifest b/packaging/libmedia-thumbnail.manifest
index 017d22d..c00c25b 100644
--- a/packaging/libmedia-thumbnail.manifest
+++ b/packaging/libmedia-thumbnail.manifest
@@ -1,5 +1,5 @@
<manifest>
- <request>
- <domain name="_"/>
- </request>
+ <request>
+ <domain name="_" />
+ </request>
</manifest>
diff --git a/packaging/libmedia-thumbnail.spec b/packaging/libmedia-thumbnail.spec
index 35c336c..ab203d9 100644
--- a/packaging/libmedia-thumbnail.spec
+++ b/packaging/libmedia-thumbnail.spec
@@ -5,7 +5,9 @@ Release: 1
Group: utils
License: Apache
Source0: %{name}-%{version}.tar.gz
-Source1001: libmedia-thumbnail.manifest
+Source1001: %{name}.manifest
+Source1002: %{name}-devel.manifest
+Source1003: media-thumbnail-server.manifest
Requires: media-server
BuildRequires: cmake
@@ -48,7 +50,7 @@ Description: Media Thumbnail Server.
%prep
%setup -q
-cp %{SOURCE1001} .
+cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} .
%build
@@ -75,13 +77,13 @@ cp -rf %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/%{_datadir}/license/
%{_datadir}/license/%{name}
%files devel
-%manifest %{name}.manifest
+%manifest %{name}-devel.manifest
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/media-thumbnail.pc
%{_includedir}/media-thumbnail/*.h
%files -n media-thumbnail-server
-%manifest %{name}.manifest
+%manifest media-thumbnail-server.manifest
%defattr(-,root,root,-)
%{_bindir}/media-thumbnail-server
/usr/local/bin/test-thumb
diff --git a/packaging/media-thumbnail-server.manifest b/packaging/media-thumbnail-server.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/media-thumbnail-server.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+ <domain name="_" />
+ </request>
+</manifest>