Merge branch 'tizen_4.0' into tizen

Change-Id: Ib26523597f897350c7817ab8c5559121983252d6
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --cc packaging/resourced.spec
index b49c39a08c8d4f42dec9fd07d1410ebffaa45ac0,6b1b88d952943e5d87b8730f43ecdf940b12bf74..abe7c8bc5ccd5dd1506b04ccc77e5f87d413909d
--- 1/packaging/resourced.spec
--- 2/packaging/resourced.spec
+++ b/packaging/resourced.spec
@@@ -60,10 -62,17 +62,17 @@@ Resourced daemon
  
  %package light
  Summary:      Resourced light binary
+ Provides:   %{name}
  Conflicts:    %{name}
  %description light
 -Resourced binary without heart module
 +Resourced binary without logging modules
  
+ %package config-tv
+ Summary:    Configration for tv profile
+ Requires:   %{name} = %{version}-%{release}
+ %description config-tv
+ Change the link of config file with the tv profile's
+ 
  %prep
  %setup -q