rpms/dejavu-fonts/devel dejavu-fonts-block.xsl, 1.2, 1.3 dejavu-fonts.spec, 1.28, 1.29

[Nicolas Mailhot (nim)]

Author: nim

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

Modified Files:
	dejavu-fonts-block.xsl dejavu-fonts.spec 
Log Message:
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


Index: dejavu-fonts-block.xsl
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-block.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dejavu-fonts-block.xsl	11 Jun 2006 11:32:15 -0000	1.2
+++ dejavu-fonts-block.xsl	11 Jun 2006 12:25:03 -0000	1.3
@@ -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>


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dejavu-fonts.spec	11 Jun 2006 11:45:41 -0000	1.28
+++ dejavu-fonts.spec	11 Jun 2006 12:25:03 -0000	1.29
@@ -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 @@
 
 
 %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