diff options
author | Jaeun Choi <jaeun12.choi@samsung.com> | 2015-08-27 15:39:54 +0900 |
---|---|---|
committer | Jaeun Choi <jaeun12.choi@samsung.com> | 2015-08-27 15:42:22 +0900 |
commit | 7aa030b1232f876272041bc61cbcdabffa049ece (patch) | |
tree | a77acb9403e7f85b3fb67479e959a01f194cb0f1 | |
parent | 689813d6d7089f9b1de674da02487776ccbd43dc (diff) | |
parent | 2df542ecd037074d5ab327f587817fed883b135f (diff) | |
download | default-fonts-fc-sdk-7aa030b1232f876272041bc61cbcdabffa049ece.tar.gz default-fonts-fc-sdk-7aa030b1232f876272041bc61cbcdabffa049ece.tar.bz2 default-fonts-fc-sdk-7aa030b1232f876272041bc61cbcdabffa049ece.zip |
Merge branch 'tizen_2.4' into tizensubmit/tizen/20150917.062942accepted/tizen/wearable/20150917.084539accepted/tizen/tv/20150917.084511accepted/tizen/mobile/20150917.084437
Change-Id: Ic29ca657108327eb5d47b33936e10e7265135204
-rwxr-xr-x | LICENSE | 2 | ||||
-rw-r--r-- | copyright | 2 | ||||
-rwxr-xr-x | default-fonts-fc-sdk.init.sh | 1 | ||||
-rw-r--r-- | packaging/default-fonts-fc-sdk.spec | 43 | ||||
-rwxr-xr-x | sdk_fonts_fc/10-hinting-slight.conf | 8 | ||||
-rw-r--r-- | sdk_fonts_fc/99-slp.conf | 66 |
6 files changed, 78 insertions, 44 deletions
@@ -1,4 +1,4 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
Apache License
Version 2.0, January 2004
@@ -1,7 +1,7 @@ /* * default-fonts-fc-sdk * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: Minsu Han <minsu81.han@samsung.com> * diff --git a/default-fonts-fc-sdk.init.sh b/default-fonts-fc-sdk.init.sh new file mode 100755 index 0000000..e615626 --- /dev/null +++ b/default-fonts-fc-sdk.init.sh @@ -0,0 +1 @@ +cp -p /usr/opt/etc/fonts/conf.avail/*.conf /opt/etc/fonts/conf.avail/ diff --git a/packaging/default-fonts-fc-sdk.spec b/packaging/default-fonts-fc-sdk.spec index dd009fd..8cc91b7 100644 --- a/packaging/default-fonts-fc-sdk.spec +++ b/packaging/default-fonts-fc-sdk.spec @@ -1,14 +1,13 @@ #sbs-git:slp/sdk/default-fonts-fc-sdk default-fonts-fc-sdk 0.0.2 8414dbd3e62b6f7a864ba031e043dd7604b3d86d Name: default-fonts-fc-sdk Summary: Font configuration package for SDK -Version: 0.0.2 -Release: 0 -Group: SDK/Configuration +Version: 0.0.5 +Release: 1 +Group: TO_BE/FILLED_IN License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -Source1001: default-fonts-fc-sdk.manifest -BuildArch: noarch -BuildRequires: libtzplatform-config-devel +Source1001: packaging/default-fonts-fc-sdk.manifest +Requires: smack-utils %description Font configuration package for SDK @@ -21,21 +20,29 @@ This package is maintained by SDK team cp %{SOURCE1001} . %install -rm -rf %{buildroot} +export FONT_CONF_FILE_1="99-slp.conf" +export FONT_CONF_FILE_2="10-hinting-slight.conf" -mkdir -p %{buildroot}%{_prefix}/etc/fonts/conf.d/ -mkdir -p %{buildroot}%{TZ_SYS_ETC}/fonts/conf.avail/ && cp -a sdk_fonts_fc/* %{buildroot}%{TZ_SYS_ETC}/fonts/conf.avail/ -cd %{buildroot}%{_prefix}/etc/fonts/conf.d/ -ln -s ../../../..%{TZ_SYS_ETC}/fonts/conf.avail/99-slp.conf %{buildroot}%{_prefix}/etc/fonts/conf.d/99-slp.conf +rm -rf %{buildroot} +mkdir -p %{buildroot}/opt/etc/fonts/conf.avail/ +mkdir -p %{buildroot}/etc/opt/init/ && cp -a default-fonts-fc-sdk.init.sh %{buildroot}/etc/opt/init/ +mkdir -p %{buildroot}/usr/etc/fonts/conf.d/ +mkdir -p %{buildroot}/usr/opt/etc/fonts/conf.avail/ && cp -a sdk_fonts_fc/* %{buildroot}/usr/opt/etc/fonts/conf.avail/ +cd %{buildroot}/usr/etc/fonts/conf.d/ +ln -s ../../../../opt/etc/fonts/conf.avail/$FONT_CONF_FILE_1 %{buildroot}/usr/etc/fonts/conf.d/$FONT_CONF_FILE_1 +ln -s ../../../../opt/etc/fonts/conf.avail/$FONT_CONF_FILE_2 %{buildroot}/usr/etc/fonts/conf.d/$FONT_CONF_FILE_2 %post -TZ_SYS_USER_GROUP_ID=$(getent group %{TZ_SYS_USER_GROUP} | cut -d: -f3) -chown :$TZ_SYS_USER_GROUP_ID %{TZ_SYS_ETC}/fonts/conf.avail/99-slp.conf -chmod 664 %{TZ_SYS_ETC}/fonts/conf.avail/99-slp.conf +chown root:app /usr/opt/etc/fonts/conf.avail/*.conf +chmod 664 /usr/opt/etc/fonts/conf.avail/*.conf +/etc/opt/init/default-fonts-fc-sdk.init.sh +chsmack -a '*' /opt/etc/fonts/conf.avail/*.conf %files -%manifest %{name}.manifest +%manifest default-fonts-fc-sdk.manifest %defattr(-,root,root,-) -%{TZ_SYS_ETC}/fonts/conf.avail/99-slp.conf -%{_prefix}/etc/fonts/conf.d/99-slp.conf -%exclude %{_prefix}/etc/fonts/conf.d/documentation.list +/usr/opt/etc/fonts/conf.avail/*.conf +/usr/etc/fonts/conf.d/*.conf +/etc/opt/init/default-fonts-fc-sdk.init.sh +/opt/etc/fonts/conf.avail/ +%exclude /usr/etc/fonts/conf.d/documentation.list diff --git a/sdk_fonts_fc/10-hinting-slight.conf b/sdk_fonts_fc/10-hinting-slight.conf new file mode 100755 index 0000000..2073d96 --- /dev/null +++ b/sdk_fonts_fc/10-hinting-slight.conf @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> +<!-- Use Slight Hinting --> + <match target="font"> + <edit name="hintstyle" mode="assign"><const>hintslight</const></edit> + </match> +</fontconfig> diff --git a/sdk_fonts_fc/99-slp.conf b/sdk_fonts_fc/99-slp.conf index 0cbf470..154d598 100644 --- a/sdk_fonts_fc/99-slp.conf +++ b/sdk_fonts_fc/99-slp.conf @@ -4,7 +4,7 @@ <!-- default-fonts-fc-sdk - Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + Copyright (c) 2011 - 2014 Samsung Electronics Co., Ltd. All rights reserved. Contact: Minsu Han <minsu81.han@samsung.com> @@ -28,39 +28,57 @@ <match target="pattern"> <!-- check to see if the font is just regular --> <test qual="any" name="family"> - <string>SLP</string> - </test> - <edit name="family" mode="assign"> - <string>TizenSans</string> - </edit> - </match> - - <match target="pattern"> - <!-- check to see if the font is just regular --> - <test qual="any" name="family"> <string>Tizen</string> </test> <edit name="family" mode="assign"> - <string>TizenSans</string> + <string>BreezeSans</string> </edit> </match> - <match> - <test name="lang" compare="contains"> - <string>ko</string> + <alias binding="strong"> + <family>BreezeSans</family> + <prefer> + <family>BreezeSans</family> + </prefer> + <default> + <family>BreezeSans</family> + </default> + </alias> + + <alias binding="strong"> + <family>TizenSans</family> + <prefer> + <family>TizenSans</family> + </prefer> + <default> + <family>BreezeSans</family> + </default> + </alias> + + <alias binding="strong"> + <family>BreezeSans</family> + <prefer> + <family>BreezeSans</family> + <family>BreezeSansKorean</family> + <family>BreezeSansChinese</family> + <family>BreezeSansJapanese</family> + <family>BreezeSansThai</family> + <family>BreezeSansArabic</family> + <family>BreezeColorEmoji</family> + <family>BreezeSansFallback</family> + </prefer> + </alias> + + <match target="pattern"> + <test qual="any" name="lang" compare="contains"> + <string>ja</string> </test> <test name="family"> - <string>TizenSans</string> + <string>BreezeSansChinese</string> </test> - <edit name="family" mode="prepend"> - <string>TizenSansKorean</string> + <edit name="family" mode="prepend" binding="strong"> + <string>BreezeSansJapanese</string> </edit> </match> - <alias binding="strong"> - <family>TizenSans</family> - <prefer> - <family>TizenSans</family> - </prefer> - </alias> </fontconfig> |