[packages/fontconfig] you do need pretrans for the todo item, but need to restore old path to exist after scriptlet

glen glen at pld-linux.org
Thu Aug 2 12:26:01 CEST 2012


commit 97d755c0dc426e4648ac508c3a06306c9f6827a7
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 2 13:25:57 2012 +0300

    you do need pretrans for the todo item, but need to restore old path to exist after scriptlet

 fontconfig.spec | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/fontconfig.spec b/fontconfig.spec
index af61175..a5898e0 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -164,11 +164,19 @@ install %{SOURCE1} \
 
 ln -s %{_datadir}/%{name}/conf.avail $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail
 
-cp -f conf.d/README README.confd
+cp -pf conf.d/README README.confd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pretrans
+# this needs to be a symlink
+if [ -d %{_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
+fi
+
 %post
 umask 022
 HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
@@ -181,9 +189,9 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 %doc AUTHORS COPYING ChangeLog README README.confd doc/fontconfig-user.html
 %dir %{_sysconfdir}/fonts
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/fonts.conf
+%{_sysconfdir}/fonts/conf.avail
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}/fonts.dtd
-%{_sysconfdir}/fonts/conf.avail
 %dir %{_datadir}/%{name}/conf.avail
 %{_datadir}/%{name}/conf.avail/*.conf
 %dir %{_sysconfdir}/fonts/conf.d


More information about the pld-cvs-commit mailing list