From b47cfe7e82de13b1cd61e9b1e8905f93a0c4fa84 Mon Sep 17 00:00:00 2001
From: Ossama Othman <ossama.othman@intel.com>
Date: Tue, 3 Dec 2013 10:54:18 -0800
Subject: [PATCH] Build and package Layer Management service binaries.

Change-Id: Ia44bba586bd881001ce79ccde78d707fcdb3e694
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
---
 packaging/layer-management.manifest |  5 +++++
 packaging/layer-management.spec     | 36 +++++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 packaging/layer-management.manifest

diff --git a/packaging/layer-management.manifest b/packaging/layer-management.manifest
new file mode 100644
index 0000000..017d22d
--- /dev/null
+++ b/packaging/layer-management.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>
diff --git a/packaging/layer-management.spec b/packaging/layer-management.spec
index ce9734e..e6abfc2 100644
--- a/packaging/layer-management.spec
+++ b/packaging/layer-management.spec
@@ -5,8 +5,15 @@ Summary:          Automotive Layer Management Infrastructure
 Version:          1.2.0
 Release:          1
 Source:           %{name}-%{version}.tar.gz
+Source1001:       %{name}.manifest
 BuildRequires:    cmake
 BuildRequires:    pkgconfig(dbus-1)
+BuildRequires:    pkgconfig(libffi)
+BuildRequires:    pkgconfig(wayland-client)
+BuildRequires:    pkgconfig(wayland-egl)
+BuildRequires:    pkgconfig(wayland-server)
+BuildRequires:    pkgconfig(xkbcommon) >= 0.3.0
+BuildRequires:    pkgconfig(mtdev) >= 1.1.0
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -30,6 +37,7 @@ Files needed for developing against the Automotive Layer Management Infrastructu
 
 %prep
 %setup -q -n %{name}-%{version}
+cp %{SOURCE1001} .
 
 %build
 mkdir build
@@ -40,23 +48,18 @@ cd build
       -DWITH_EGL_EXAMPLE=OFF \
       -DWITH_CLIENTEXAMPLES=OFF \
       -DWITH_X11_GLES=OFF \
-      -DWITH_WAYLAND_DRM=OFF \
-      -DWITH_SERVICE_BIN=OFF \
-      -DWITH_CONTROL_BIN=OFF \
-      -DWITH_GENERIC_COMMUNICATOR=OFF \
+      -DWITH_WAYLAND_DRM=ON \
+      -DWITH_SERVICE_BIN=ON \
+      -DWITH_CONTROL_BIN=ON \
+      -DWITH_GENERIC_COMMUNICATOR=ON \
       ..
-make %{?jobs:-j %jobs}
+make %{?_smp_mflags}
 
 %install
 rm -rf "$RPM_BUILD_ROOT"
 cd build
 %make_install
 
-# At this time we are not installing the layer manager service
-# with the expectation that the libraries will connect to the
-# layer manager plugin running in weston
-rm -fR $RPM_BUILD_ROOT/etc/dbus-1/
-
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/
 mv $RPM_BUILD_ROOT/usr/local/lib/pkgconfig/ilm.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/
 
@@ -67,13 +70,24 @@ mv $RPM_BUILD_ROOT/usr/local/lib/pkgconfig/ilm.pc $RPM_BUILD_ROOT/%{_libdir}/pkg
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
+%files
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+/etc/dbus-1/session.d/LayerManagerService.conf
+/etc/dbus-1/system.d/LayerManagerService.conf
+%{_bindir}/LayerManagerService
+%{_bindir}/LayerManagerControl
+%{_libdir}/layermanager/renderer/*
+
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/layermanager/ipcmodules/*
 %{_libdir}/*.so
+%{_libdir}/layermanager/ipcmodules/*
+%{_libdir}/layermanager/communicator/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/ilm.pc
 %{_includedir}/ilm/*.h
 %{_includedir}/layermanager/*.h
+%{_includedir}/layermanager/graphic/*/*.h
-- 
2.7.4