rpms/dejavu-fonts/devel dejavu-fonts.spec,1.27,1.28

[Nicolas Mailhot (nim)]

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22056/devel

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.7.0-0.12.fc6 on branch devel from dejavu-fonts-2.7.0-0.12.fc6.src.rpm
triggerun -> postun


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dejavu-fonts.spec	11 Jun 2006 11:32:15 -0000	1.27
+++ dejavu-fonts.spec	11 Jun 2006 11:45:41 -0000	1.28
@@ -11,7 +11,7 @@
 
 Name:      dejavu-fonts
 Version:   2.7.0
-Release:   0.10%{?dist}
+Release:   0.12%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -179,6 +179,7 @@
   /bin/cat $TMPFILE > %{fontconfdir}/fonts.conf && /bin/rm $TMPFILE
 fi
 
+
 # These bits do not seem achieveable right now by dumping files in
 # %{fontconfdir}/conf.d
 %triggerin block -- fontconfig, %{fontconfdir}/fonts.conf
@@ -189,8 +190,9 @@
   /bin/cat $TMPFILE > %{fontconfdir}/fonts.conf && /bin/rm $TMPFILE
 fi
 
-%triggerun block -- fontconfig, %{fontconfdir}/fonts.conf
-if [ -w %{fontconfdir}/fonts.conf ] ; then
+
+%preun block
+if [ "$1" = "0" -a -w %{fontconfdir}/fonts.conf ] ; then
   TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \
   %{_bindir}/xsltproc --novalid --output $TMPFILE \
     %{xsldir}/unblock.xsl %{fontconfdir}/fonts.conf && \
@@ -235,6 +237,9 @@
 
 
 %changelog
+* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.12
+- replace triggerun by preun
+
 * Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.10
 - block Sans instead of sans-serif - GNOME uses the first one