[packages/fontconfig] dir check works over symlinks too, ensure it is not symlink

glen glen at pld-linux.org
Thu Aug 2 12:27:05 CEST 2012


commit 0ae394006168417aa29be2d2e895c0cb7b492732
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 2 13:27:02 2012 +0300

    dir check works over symlinks too, ensure it is not symlink

 fontconfig.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/fontconfig.spec b/fontconfig.spec
index a5898e0..6a350d8 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -171,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %pretrans
 # this needs to be a symlink
-if [ -d %{_sysconfdir}/fonts/conf.avail ]; then
+if [ -d %{_sysconfdir}/fonts/conf.avail ] && [ ! -L %{_sysconfdir}/fonts/conf.avail ]; then
 	mv -f %{_sysconfdir}/fonts/conf.avail{,.rpmsave}
 	install -d %{_datadir}/%{name}/conf.avail
 	ln -s %{_datadir}/%{name}/conf.avail %{_sysconfdir}/fonts/conf.avail
@@ -208,7 +208,7 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 %{_mandir}/man1/fc-*.1*
 %{_mandir}/man5/fonts-conf.5*
 %endif
-/var/cache/fontconfig
+%dir /var/cache/fontconfig
 
 %files libs
 %defattr(644,root,root,755)


More information about the pld-cvs-commit mailing list