From 69492ccfda4bae11eadb257d025fe6ea5ec345d0 Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 11 Jun 2006 11:45:41 +0000 Subject: [PATCH] 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 --- dejavu-fonts.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index f408ef0..715824b 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -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 @@ if [ -w %{fontconfdir}/fonts.conf ] ; then /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 @@ if [ -w %{fontconfdir}/fonts.conf ] ; then /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 @@ fi %changelog +* Sun Jun 11 2006 Nicolas Mailhot - 2.7.0-0.12 +- replace triggerun by preun + * Sun Jun 11 2006 Nicolas Mailhot - 2.7.0-0.10 - block Sans instead of sans-serif - GNOME uses the first one