Merge branch 'tizen' into gtest

Change-Id: Ia26a039f45177b75a4ff2b2de0834fc486b82881
Signed-off-by: Konstantin Drabeniuk <k.drabeniuk@samsung.com>

diff --cc packaging/libeom.spec
index 1146d6eb3b21a14d999baa204ec5f5cb44f67f54,0235b96381b2154f9d797d0bc6850a3c333b2efa..732d6d3313752fc10df6a8fb4ccd61838f00f66b
--- 1/packaging/libeom.spec
--- 2/packaging/libeom.spec
+++ b/packaging/libeom.spec
@@@ -24,11 -18,15 +18,11 @@@ BuildRequires:  pkgconfig(gio-unix-2.0
  BuildRequires:  pkgconfig(capi-base-common)
  BuildRequires:  pkgconfig(elementary)
  
 -%if %{with utest}
 -BuildRequires:  gtest-devel
 -%endif
 -
  %description
- This package provides the runtime library to manage eo(External Output)
+ This package provides the runtime library to manage External Output
  
  %package devel
- Summary: External Output Manager Library development package
+ Summary: EOM Library development package
  Group: Development/Libraries
  Requires: %{name} = %{version}-%{release}
  Requires: pkgconfig(capi-base-common)
@@@ -81,9 -61,8 +67,11 @@@ make %{?_smp_mflags
  rm -rf %{buildroot}
  mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/license
  cp -af COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/license/%{name}
+ mkdir -p %{buildroot}/usr/include
+ cp src/eom-server-protocol.h %{buildroot}/usr/include
 +%if %{with utest}
 +cp -af %{_builddir}/%{buildsubdir}/ut/gtest/googletest/LICENSE %{buildroot}/%{TZ_SYS_RO_SHARE}/license/googletest
 +%endif
  %make_install
  
  %remove_docs
@@@ -92,20 -74,18 +83,23 @@@
  %manifest %{name}.manifest
  %defattr(-,root,root,-)
  %{TZ_SYS_RO_SHARE}/license/%{name}
+ %{_includedir}/eom-server-protocol.h
  %{_libdir}/libeom.so.*
 -%if %{with utest}
 -%{_bindir}/ut
 -%endif
+ %{_libdir}/libeom-server-protocol.so.*
  
  %files devel
  %manifest %{name}.manifest
  %dir %{_includedir}/eom/
  %{_includedir}/eom/*.h
  %{_libdir}/libeom.so
+ %{_libdir}/libeom-server-protocol.so
  %{_libdir}/pkgconfig/eom.pc
  
 +%if %{with utest}
 +%files utests
 +%defattr(-,root,root,-)
 +%{_bindir}/eom_utests
 +%{TZ_SYS_RO_SHARE}/license/%{name}
 +%{TZ_SYS_RO_SHARE}/license/googletest
 +%endif
 +