Fix rpm packaging error

- modify doc install path
- include libamb-json-protocol.so, bluemonkey, /etc/init.d/ambd
- add amb.manifest file

Change-Id: I58c989bf29af40f2840930a6ac1bc356cd5b7beb
Signed-off-by: Sangjung Woo <sangjung.woo@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 230f3c9..1ab5463 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,8 +26,8 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
 set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" )
 set (PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}")
 set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
-set (DOC_INSTALL_DIR "${CMAKE_INSTALL_DOCDIR}/${PROJECT_SERIES}")
-set (PLUGIN_SEGMENT_INSTALL_PATH "${CMAKE_INSTALL_SYSCONFDIR}/ambd/plugins.d")
+set (DOC_INSTALL_DIR "${CMAKE_INSTALL_DOCDIR}/${PROJECT_NAME}/${PROJECT_SERIES}")
+set (PLUGIN_SEGMENT_INSTALL_PATH "/${CMAKE_INSTALL_SYSCONFDIR}/ambd/plugins.d")
 
 option(qtmainloop "Use QCoreApplication mainloop " OFF)
 option(websocket_plugin "websocket source and sink plugins" OFF)

diff --git a/packaging/amb.manifest b/packaging/amb.manifest
new file mode 100644 (file)
index 0000000..ceb5db4
--- /dev/null
+++ b/packaging/amb.manifest
@@ -0,0 +1,63 @@
+<manifest>
+  <define>
+        <domain name="AMB" />
+        <provide>
+          <label name="AMB::readall" />
+          <label name="AMB::writeall" />
+          <label name="AMB::machinegun" />
+        </provide>
+        <request>
+          <smack request="_" type="rwxatl" />
+          <smack request="User" type="w" />
+          <smack request="System" type="wx" />
+          <smack request="System::Run" type="rwxat" />
+          <smack request="System::Shared" type="rx" />
+          <smack request="AMB::readall" type="rw" />
+          <smack request="AMB::writeall" type="rw" />
+          <smack request="AMB::machinegun" type="rw" />
+        </request>
+        <permit>
+          <smack permit="_" type="w" />
+          <smack permit="System" type="rwx" />
+          <smack permit="User" type="w" />
+        </permit>
+  </define>
+  <assign>
+       <dbus name="org.automotive.message.broker" own="AMB" bus="system">
+         <!--<node name="*/0/MachineGunTurretStatus" >
+               <interface name="org.freedesktop.DBus.Properties">
+                 <method name="Set" >
+                       <annotation name="com.tizen.smack" value="AMB::machinegun" />
+                 </method>
+               </interface>
+         </node>
+         <node name="*" >
+               <interface name="org.freedesktop.DBus.Properties">
+                 <method name="Set" >
+                       <annotation name="com.tizen.smack" value="AMB::writeall" />
+                 </method>
+               </interface>
+         </node>
+         -->
+         <!--<node name="*" >
+               <interface name="org.freedesktop.DBus.Properties">
+                 <method name="Get" >
+                       <annotation name="com.tizen.smack" value="AMB::readall" />
+                 </method>
+               </interface>
+         </node>
+         <node name="*" >
+               <interface name="org.freedesktop.DBus.Properties">
+                 <method name="GetAll" >
+                       <annotation name="com.tizen.smack" value="AMB::readall" />
+                 </method>
+               </interface>
+         </node>-->
+       </dbus>
+       <filesystem path="/usr/bin/ambd" exec_label="AMB" />
+       <filesystem path="lib/x86_64-linux-gnu*" label="_" />
+  </assign>
+  <request>
+       <domain name="AMB" />
+  </request>
+</manifest>

diff --git a/packaging/automotive-message-broker.spec b/packaging/automotive-message-broker.spec
index db66c64..26845c7 100644 (file)
--- a/packaging/automotive-message-broker.spec
+++ b/packaging/automotive-message-broker.spec
@@ -1,4 +1,4 @@
-%bcond_without qt5
+%bcond_with qt5
 
 %define enable_plugin_opencvlux OFF
 
@@ -236,6 +236,7 @@ Crosswalk vehicle API extension based on the W3C Automotive Business Group Vehic
 
 %build
 %cmake \
+          -DCMAKE_INSTALL_DOCDIR=%{_docdir} \
           -Dxwalk_vehicle_extension=ON \
           -DXWALK_EXTENSION_PATH=/tizen-extensions-crosswalk \
 %if %{with qt5}
@@ -291,6 +292,8 @@ cp packaging/config.tizen %{buildroot}%{_sysconfdir}/ambd/
 %{_bindir}/amb-set
 %{_bindir}/amb-listen
 %{_bindir}/ambctl
+%{_sysconfdir}/init.d/ambd
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -344,6 +347,8 @@ cp packaging/config.tizen %{buildroot}%{_sysconfdir}/ambd/
 %manifest packaging.in/amb.manifest.plugins
 %defattr(-,root,root,-)
 %{_libdir}/libamb-plugins-common.so
+%{_libdir}/libamb-json-protocol.so
+
 
 %files plugins-wheel
 %defattr(-,root,root,-)
@@ -402,6 +407,7 @@ cp packaging/config.tizen %{buildroot}%{_sysconfdir}/ambd/
 %{_libdir}/%{name}/bluemonkeyplugin.so
 %config %{_sysconfdir}/ambd/bluemonkey
 %{_sysconfdir}/ambd/plugins.d/bluemonkey
+%{_bindir}/bluemonkey
 
 %files -n bluemonkey-modules-db
 %manifest packaging.in/amb.manifest.plugins