From 6c6b1cfc3321569a993ec079279289180232b70d Mon Sep 17 00:00:00 2001
From: nim <nim@fedoraproject.org>
Date: Sun, 11 Jun 2006 12:25:03 +0000
Subject: [PATCH] auto-import dejavu-fonts-2.7.0-0.14.fc6 on branch devel from
 dejavu-fonts-2.7.0-0.14.fc6.src.rpm remove old blocking code before adding
 new one

---
 dejavu-fonts-block.xsl | 2 ++
 dejavu-fonts.spec      | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dejavu-fonts-block.xsl b/dejavu-fonts-block.xsl
index 3d96679..b7a3862 100644
--- a/dejavu-fonts-block.xsl
+++ b/dejavu-fonts-block.xsl
@@ -19,6 +19,8 @@
   <xsl:template match="@*|comment()">
     <xsl:copy/>
   </xsl:template>
+<!-- Remove our old blocking code -->
+  <xsl:template match="fontconfig/match[comment()[.='Added by dejavu-fonts-block']]" priority ="2"/>
 <!-- Add Arabic and Persian overrides for default aliases -->
   <xsl:template match="fontconfig/dir[position()=last()]" priority ="1">
     <xsl:copy>
diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec
index 715824b..b921082 100644
--- a/dejavu-fonts.spec
+++ b/dejavu-fonts.spec
@@ -11,7 +11,7 @@
 
 Name:      dejavu-fonts
 Version:   2.7.0
-Release:   0.12%{?dist}
+Release:   0.14%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -237,6 +237,9 @@ fi
 
 
 %changelog
+* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.14
+- remove old blocking code before adding new one
+
 * Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.12
 - replace triggerun by preun