Merge "Revert smack label changes and change owner of fontconfig cache files" into...

diff --git a/packaging/fontconfig.conf b/packaging/fontconfig.conf
index f48c663..1661cc5 100644 (file)
--- a/packaging/fontconfig.conf
+++ b/packaging/fontconfig.conf
@@ -1,3 +1,3 @@
-d      /opt/var/cache/fontconfig       1774    display users
-t      /opt/var/cache/fontconfig       -       -       -       -       security.SMACK64="_"
+d      /opt/var/cache/fontconfig       1774    owner   users
+t      /opt/var/cache/fontconfig       -       -       -       -       security.SMACK64="User::App::Shared"
 t      /opt/var/cache/fontconfig       -       -       -       -       security.SMACK64TRANSMUTE="TRUE"

diff --git a/packaging/fontconfig.spec b/packaging/fontconfig.spec
index 7f0ef71..6f9fa3d 100644 (file)
--- a/packaging/fontconfig.spec
+++ b/packaging/fontconfig.spec
@@ -120,6 +120,8 @@ mkdir -p %{TZ_SYS_RO_SHARE}/app_fonts
 # The HOME setting is to avoid problems if HOME hasn't been reset
 if [ -x %{TZ_SYS_BIN}/fc-cache ] && %{TZ_SYS_BIN}/fc-cache --version 2>&1 | grep -q %{version} ; then
 fc-cache -rf --system-only
+chown -R owner:users %{TZ_SYS_VAR}/cache/fontconfig
+chmod -R 664 %{TZ_SYS_VAR}/cache/fontconfig
 fi
 
 %postun -p /sbin/ldconfig