Merge branch 'tizen_6.0' into tizen

Change-Id: I8d66801259c69fd63d458ccc4ee9f2a16bc2b3cd

diff --combined packaging/isf.spec
index d218fc6,1f99b48..092092e
--- 1/packaging/isf.spec
--- 2/packaging/isf.spec
+++ b/packaging/isf.spec
@@@ -3,7 -3,7 +3,7 @@@
  %bcond_with wayland
  Name:       isf
  Summary:    Input Service Framework
- Version:    6.0.45
+ Version:    6.0.46
  Release:    1
  Group:      Graphics & UI Framework/Input
  License:    LGPL-2.1+
@@@ -202,10 -202,8 +202,10 @@@ mkdir -p %{TZ_SYS_RO_APP}/org.tizen.isf
  %{APP_PREFIX}/*
  
  %files unittests
 +%manifest isf-unittests.manifest
 +%license COPYING
  %defattr(-,root,root,-)
 -%{_bindir}/*
 +%{_bindir}/isf-tests
  
  %files -n ise-engine-loader
  %manifest ise-engine-loader.manifest