rpms/dejavu-fonts/devel dejavu-fonts-block.xsl, 1.1, 1.2 dejavu-fonts.spec, 1.26, 1.27

[Nicolas Mailhot (nim)]

Author: nim

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

Modified Files:
	dejavu-fonts-block.xsl dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.7.0-0.10.fc6 on branch devel from dejavu-fonts-2.7.0-0.10.fc6.src.rpm
block sans instead of sans-serif


Index: dejavu-fonts-block.xsl
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-block.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dejavu-fonts-block.xsl	11 Jun 2006 11:18:55 -0000	1.1
+++ dejavu-fonts-block.xsl	11 Jun 2006 11:32:15 -0000	1.2
@@ -28,7 +28,7 @@
     <match>
       <xsl:comment>Added by dejavu-fonts-block</xsl:comment>
       <xsl:comment>Use KacstQura as default sans-serif when lang is Arabic</xsl:comment>
-      <test name="family"><string>sans-serif</string></test>
+      <test name="family"><string>Sans</string></test>
       <test name="lang"><string>ar</string></test>
       <edit name="family" mode="assign" binding="same">
         <string>KacstQura</string>
@@ -37,7 +37,7 @@
     <match>
       <xsl:comment>Added by dejavu-fonts-block</xsl:comment>
       <xsl:comment>Use KacstQura as default serif when lang is Arabic</xsl:comment>
-      <test name="family"><string>serif</string></test>
+      <test name="family"><string>Serif</string></test>
       <test name="lang"><string>ar</string></test>
       <edit name="family" mode="assign" binding="same">
         <string>KacstQura</string>
@@ -46,7 +46,7 @@
     <match>
       <xsl:comment>Added by dejavu-fonts-block</xsl:comment>
       <xsl:comment>Use KacstQura as default monospace when lang is Arabic</xsl:comment>
-      <test name="family"><string>monospace</string></test>
+      <test name="family"><string>Monospace</string></test>
       <test name="lang"><string>ar</string></test>
       <edit name="family" mode="assign" binding="same">
         <string>KacstQuraFixed</string>
@@ -55,7 +55,7 @@
     <match>
       <xsl:comment>Added by dejavu-fonts-block</xsl:comment>
       <xsl:comment>Use Roya as default sans-serif when lang is Farsi</xsl:comment>
-      <test name="family"><string>sans-serif</string></test>
+      <test name="family"><string>Sans</string></test>
       <test name="lang"><string>fa</string></test>
       <edit name="family" mode="assign" binding="same">
         <string>Roya</string>
@@ -64,7 +64,7 @@
     <match>
       <xsl:comment>Added by dejavu-fonts-block</xsl:comment>
       <xsl:comment>Use Nazli as default serif when lang is Farsi</xsl:comment>
-      <test name="family"><string>serif</string></test>
+      <test name="family"><string>Serif</string></test>
       <test name="lang"><string>fa</string></test>
       <edit name="family" mode="assign" binding="same">
         <string>Nazli</string>
@@ -73,7 +73,7 @@
     <match>
       <xsl:comment>Added by dejavu-fonts-block</xsl:comment>
       <xsl:comment>Use Terafik as default monospace when lang is Farsi</xsl:comment>
-      <test name="family"><string>monospace</string></test>
+      <test name="family"><string>Monospace</string></test>
       <test name="lang"><string>fa</string></test>
       <edit name="family" mode="assign" binding="same">
         <string>Terafik</string>


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- dejavu-fonts.spec	11 Jun 2006 11:18:55 -0000	1.26
+++ dejavu-fonts.spec	11 Jun 2006 11:32:15 -0000	1.27
@@ -11,7 +11,7 @@
 
 Name:      dejavu-fonts
 Version:   2.7.0
-Release:   0.9%{?dist}
+Release:   0.10%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -235,6 +235,9 @@
 
 
 %changelog
+* 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
+
 * Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.9
 - reintroduce xslt triggers in dejavu-fonts-block as fontconfig conf.d priority
   is not high enough for our needs