Merge branch 'tizen_5.5' into tizen

Change-Id: Idb9a3cc77ba66a11e61957eea433c2d7f21d1653

diff --combined packaging/capi-ui-sticker.spec
index 6020f8a,871c986..ffe6b82
--- 1/packaging/capi-ui-sticker.spec
--- 2/packaging/capi-ui-sticker.spec
+++ b/packaging/capi-ui-sticker.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       capi-ui-sticker
  Summary:    Sticker client library and daemon
- Version:    0.1.49
+ Version:    0.1.51
  Release:    1
  Group:      Graphics & UI Framework/Input
  License:    Apache-2.0
@@@ -24,7 -24,6 +24,7 @@@ BuildRequires:  pkgconfig(json-glib-1.0
  BuildRequires:  pkgconfig(libtzplatform-config)
  BuildRequires:  pkgconfig(pkgmgr-info)
  BuildRequires:  pkgconfig(sqlite3)
 +BuildRequires:  pkgconfig(gmock)
  
  %if 0%{?sec_product_feature_profile_wearable}
  BuildRequires:  pkgconfig(capi-base-common)
@@@ -47,11 -46,6 +47,11 @@@ Requires(post): /sbin/ldconfi
  Requires(post): dbus
  Requires(postun): /sbin/ldconfig
  
 +%if 0%{?gcov:1}
 +BuildRequires:  lcov
 +BuildRequires:  zip
 +%endif
 +
  %description
  Sticker client library and daemon
  
@@@ -86,14 -80,6 +86,14 @@@ Group:      Graphics & UI Framework/Inp
  Sticker client library and daemon (gcov)
  %endif
  
 +%package unittests
 +Summary:    Sticker tests
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description unittests
 +GTest for sticker
 +
  %prep
  %setup -q -n %{name}-%{version}
  cp %{SOURCE2} .
@@@ -121,7 -107,6 +121,7 @@@ make %{?jobs:-j%jobs
  
  %if 0%{?gcov:1}
  mkdir -p gcov-obj
 +find . -name '*_dbus.c.gcno' -exec rm {} \;
  find . -name '*.gcno' -exec cp '{}' gcov-obj ';'
  %endif
  
@@@ -129,13 -114,6 +129,13 @@@
  rm -rf %{buildroot}
  %make_install
  
 +%check
 +ctest --output-on-failure %{?_smp_mflags}
 +%if 0%{?gcov:1}
 +lcov -c --ignore-errors graph --no-external -q -d . -o gcov.info
 +genhtml gcov.info
 +%endif
 +
  mkdir -p %{buildroot}/%{TZ_SYS_ETC}/dump.d/module.d
  cp -af dump/sticker_log_dump.sh %{buildroot}/%{TZ_SYS_ETC}/dump.d/module.d
  
@@@ -206,9 -184,6 +206,9 @@@ chsmack -a "User::App::Shared" /opt/usr
  %{TZ_SYS_RO_APP}/%{_companion_app_name}/*
  %endif
  
 +%files unittests
 +%{_bindir}/*
 +
  %if 0%{?gcov:1}
  %files gcov
  %{_datadir}/gcov/obj/*