diff options
| author | Youngbok Shin <youngb.shin@samsung.com> | 2016-09-20 00:49:12 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-09-20 00:49:12 -0700 |
| commit | edc6dcb97f890e68f7d106dee95aed2bcad45e1d (patch) | |
| tree | 62e9b3427d96ba769b6aa2351a80dc0f3daec326 | |
| parent | f06dd3072805e2bbc0074e1d79fe09a7b3aa606a (diff) | |
| parent | ec98213cccbf960c1bf2ead59996fb1c89fc995c (diff) | |
| download | fontconfig-edc6dcb97f890e68f7d106dee95aed2bcad45e1d.tar.gz fontconfig-edc6dcb97f890e68f7d106dee95aed2bcad45e1d.tar.bz2 fontconfig-edc6dcb97f890e68f7d106dee95aed2bcad45e1d.zip | |
Merge "Revert smack label changes and change owner of fontconfig cache files" into tizensubmit/tizen/20160921.091905accepted/tizen/wearable/20160922.042040accepted/tizen/tv/20160922.042033accepted/tizen/mobile/20160922.042230accepted/tizen/ivi/20160922.042141accepted/tizen/common/20160921.162913
| -rw-r--r-- | packaging/fontconfig.conf | 4 | ||||
| -rw-r--r-- | packaging/fontconfig.spec | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packaging/fontconfig.conf b/packaging/fontconfig.conf index f48c6630..1661cc59 100644 --- 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 7f0ef714..6f9fa3d1 100644 --- 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 |