diff options
| author | Youngbok Shin <youngb.shin@samsung.com> | 2018-02-22 14:18:51 +0900 |
|---|---|---|
| committer | Youngbok Shin <youngb.shin@samsung.com> | 2018-06-21 12:33:32 +0900 |
| commit | 6e2800bf91e4a810ee17b8a80cfc51810b9aaf11 (patch) | |
| tree | 8bd4e395567db23e7c99e9be76aa9f6039169ae2 | |
| parent | c27c10eb671ab09a0f2fbad90cbf6cac301a496b (diff) | |
| download | fontconfig-submit/tizen/20180628.080817.tar.gz fontconfig-submit/tizen/20180628.080817.tar.bz2 fontconfig-submit/tizen/20180628.080817.zip | |
fontconfig: fix smack issue from /opt/share/fonts, ~/.fonts/, ~/.fontconfigsubmit/tizen/20180628.080817accepted/tizen/unified/20180629.154141
Change-Id: Ia43e2119b95c02882cbb83baf8ddfffbac1215bd
| -rw-r--r-- | fonts.conf.in | 4 | ||||
| -rw-r--r-- | packaging/fontconfig.spec | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/fonts.conf.in b/fonts.conf.in index 2019923d..79914053 100644 --- a/fonts.conf.in +++ b/fonts.conf.in @@ -32,7 +32,7 @@ @FC_FONTPATH@ <dir prefix="xdg">fonts</dir> <!-- the following element will be removed in the future --> - <dir>~/.fonts</dir> + <dir>~/share/fonts</dir> <!-- Accept deprecated 'mono' alias, replacing it with 'monospace' @@ -80,7 +80,7 @@ <cachedir>@FC_CACHEDIR@</cachedir> <cachedir prefix="xdg">fontconfig</cachedir> <!-- the following element will be removed in the future --> - <cachedir>~/.fontconfig</cachedir> + <cachedir>~/.cache/fontconfig</cachedir> <config> <!-- diff --git a/packaging/fontconfig.spec b/packaging/fontconfig.spec index ed424792..7ab9ae21 100644 --- a/packaging/fontconfig.spec +++ b/packaging/fontconfig.spec @@ -104,6 +104,12 @@ chmod 755 %{TZ_SYS_VAR}/cache/fontconfig chsmack -t %{TZ_SYS_VAR}/cache/fontconfig chsmack -a User::App::Shared %{TZ_SYS_VAR}/cache/fontconfig +mkdir -p %{TZ_SYS_SHARE}/fonts +chown app_fw:users %{TZ_SYS_SHARE}/fonts +chmod 755 %{TZ_SYS_SHARE}/fonts +chsmack -t %{TZ_SYS_SHARE}/fonts +chsmack -a User::App::Shared %{TZ_SYS_SHARE}/fonts + # Skip making fontconfig cache folder for users. (/opt/home/app/.cache) # The path will be changed according to a name of user. #rm -rf %{TZ_USER_CACHE}/fontconfig |