Merge remote-tracking branch 'spin/tizen_2.4' into tizen

Conflicts:
	LICENSE
	packaging/default-fonts-sdk.spec

Change-Id: Ia1ed0334b17afe4e595ce313270cfaae91f3476d

diff --cc packaging/default-fonts-sdk.spec
index f086a54,ef3babf..bf020e1
--- 1/packaging/default-fonts-sdk.spec
--- 2/packaging/default-fonts-sdk.spec
+++ b/packaging/default-fonts-sdk.spec
@@@ -1,15 -1,16 +1,15 @@@
--#default-fonts-sdk
  Name:       default-fonts-sdk
 -Summary:    fonts for Tizen SDK
 -Version:    1.3.3
 -Release:    1
 +Summary:    free fonts for Tizen SDK
 +Version:    1.2.1.0
 +Release:    10
  Group:      TO_BE/FILLED_IN
 -License:    Apache-2.0 and GPL-2.0-with-font-exception
 +License:    TO BE FILLED IN
  Source0:    %{name}-%{version}.tar.gz
  Source1001: packaging/default-fonts-sdk.manifest
 -Requires(post): fontconfig
++#Requires(post): fontconfig
  
  %description
 -fonts for Tizen SDK
 +free fonts for Tizen SDK
  This package is maintained by SDK team
  
  %prep
@@@ -20,13 -21,25 +20,19 @@@ cp %{SOURCE1001} 
  
  %install
  rm -rf %{buildroot}
 -%if 0%{?sec_product_feature_profile_wearable}
 -    export TARGET=wearable
 -%else
 -    export TARGET=mobile
 -%endif
  
- mkdir -p %{buildroot}%{_datadir}/fonts && cp -a fonts %{buildroot}%{_datadir}
- mkdir -p %{buildroot}%{_datadir}/fallback_fonts && cp -a fallback_fonts %{buildroot}%{_datadir}
+ mkdir -p %{buildroot}/usr/share/license && cp LICENSE %{buildroot}/usr/share/license/%{name}
+ mkdir -p %{buildroot}%{_datadir}/fonts && cp -a common/fonts %{buildroot}%{_datadir}
+ #cp -a $TARGET/fonts %{buildroot}%{_datadir}
+ mkdir -p %{buildroot}%{_datadir}/fallback_fonts && cp -a common/fallback_fonts %{buildroot}%{_datadir}
+ #cp -a $TARGET/fallback_fonts %{buildroot}%{_datadir}
+ 
+ %post
+ /usr/bin/fc-cache -f
  
  %files
  %manifest default-fonts-sdk.manifest
- %defattr(0644,root,root,-)
+ %defattr(-,root,root,-)
  %{_datadir}/fonts/*
  %{_datadir}/fallback_fonts/*
- 
+ /usr/share/license/%{name}
 -