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

diff --git a/packaging/fontconfig.spec b/packaging/fontconfig.spec
index 2658894..6f9fa3d 100644 (file)
--- a/packaging/fontconfig.spec
+++ b/packaging/fontconfig.spec
@@ -22,6 +22,8 @@ Requires(pre):  %{TZ_SYS_BIN}/fc-cache, %{TZ_SYS_BIN}/mkdir %{TZ_SYS_BIN}/rm, %{
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
+%define upgrade_script_path /usr/share/upgrade/scripts
+
 %description
 Fontconfig is designed to locate fonts within the
 system and select them according to requirements specified by
@@ -68,6 +70,8 @@ make %{?jobs:-j%jobs}
 #make check
 %install
 rm -rf %{buildroot}
+mkdir -p %{buildroot}%{upgrade_script_path}
+cp -f scripts/fontconfig_upgrade.sh %{buildroot}%{upgrade_script_path}
 
 %make_install
 
@@ -137,6 +141,7 @@ fi
 %config(noreplace) %{TZ_SYS_RO_ETC}/fonts/conf.d/*.conf
 %{TZ_SYS_RO_SHARE}/license/%{name}
 %{_tmpfilesdir}/fontconfig.conf
+%{upgrade_script_path}/fontconfig_upgrade.sh
 
 %files devel
 %manifest fontconfig.manifest

diff --git a/scripts/fontconfig_upgrade.sh b/scripts/fontconfig_upgrade.sh
new file mode 100755 (executable)
index 0000000..2b9a6d9
--- /dev/null
+++ b/scripts/fontconfig_upgrade.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+#------------------------------------------#
+# efl-misc upgrade (2.4 -> 3.0)            #
+#------------------------------------------#
+
+# Macro
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+# Set under the /opt
+mkdir -p /opt/var/cache/fontconfig
+chmod -R 775 /opt/var/cache/fontconfig
+chown -R :users /opt/var/cache/fontconfig
+chsmack -a 'User::App::Shared' /opt/var/cache/fontconfig
+chsmack -t /opt/var/cache/fontconfig