fontconfig: fix smack issue from /opt/share/fonts, ~/.fonts/, ~/.fontconfig

Change-Id: Ia43e2119b95c02882cbb83baf8ddfffbac1215bd

diff --git a/fonts.conf.in b/fonts.conf.in
index 2019923..7991405 100644 (file)
--- 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 ed42479..7ab9ae2 100644 (file)
--- 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