rpms/dejavu-fonts/FC-5 dejavu-fonts-arabic-override.conf, NONE, 1.1 dejavu-fonts-block.xsl, NONE, 1.1 dejavu-fonts-fontconfig.conf, NONE, 1.1 dejavu-fonts-makedefault.xsl, NONE, 1.1 dejavu-fonts-persian-override.conf, NONE, 1.1 dejavu-fonts-unblock.xsl, NONE, 1.1 .cvsignore, 1.14, 1.15 dejavu-fonts.spec, 1.21, 1.22 sources, 1.14, 1.15 dejavu-fonts-register.xsl, 1.1, NONE

Nicolas Mailhot (nim) fedora-extras-commits at redhat.com
Sun Jun 18 10:30:05 UTC 2006


Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21951/FC-5

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Added Files:
	dejavu-fonts-arabic-override.conf dejavu-fonts-block.xsl 
	dejavu-fonts-fontconfig.conf dejavu-fonts-makedefault.xsl 
	dejavu-fonts-persian-override.conf dejavu-fonts-unblock.xsl 
Removed Files:
	dejavu-fonts-register.xsl 
Log Message:
auto-import dejavu-fonts-2.7.0-0.18.20060618svn945.fc5 on branch FC-5 from dejavu-fonts-2.7.0-0.18.20060618svn945.fc5.src.rpm
sync with devel


--- NEW FILE dejavu-fonts-arabic-override.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/conf.d/00-dejavu-arabic-override.conf

     Override DejaVu use in Arabic

     © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
     This file is distributed under the terms of the GNU General
     Public License (GPL) version 2. Copies of the GPL can be obtained from:
     http://www.gnu.org/licenses/gpl.html
-->
<fontconfig>
  <match>
    <test name="family"><string>DejaVu Sans</string></test>
    <test name="lang"><string>ar</string></test>
    <edit name="family" mode="assign" binding="same">
      <string>KacstQura</string>
    </edit>
  </match>
  <match>
    <test name="family"><string>DejaVu Serif</string></test>
    <test name="lang"><string>ar</string></test>
    <edit name="family" mode="assign" binding="same">
      <string>KacstQura</string>
    </edit>
  </match>
  <match>
    <test name="family"><string>DejaVu Sans Mono</string></test>
    <test name="lang"><string>ar</string></test>
    <edit name="family" mode="assign" binding="same">
      <string>KacstQuraFixed</string>
    </edit>
  </match>
</fontconfig>


--- NEW FILE dejavu-fonts-block.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<!-- Block DejaVu use with Arabic and Persian
     © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
     This file is distributed under the terms of the GNU General
     Public License (GPL) version 2. Copies of the GPL can be obtained from:
     http://www.gnu.org/licenses/gpl.html
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <xsl:strip-space elements="*"/>
  <xsl:output method="xml" indent="yes" encoding="UTF-8" doctype-system="fonts.dtd"/>
<!-- Preserve most nodes -->
  <xsl:template match="*" priority="0">
    <xsl:copy>
      <xsl:apply-templates select="@*"/>
      <xsl:apply-templates select="*|text()|comment()"/>
    </xsl:copy>
  </xsl:template>
<!-- Preserve attributes and comments -->
  <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>
      <xsl:apply-templates select="@*"/>
      <xsl:apply-templates select="*|text()|comment()"/>
    </xsl:copy>
    <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</string></test>
      <test name="lang"><string>ar</string></test>
      <edit name="family" mode="assign" binding="same">
        <string>KacstQura</string>
      </edit>
    </match>
    <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="lang"><string>ar</string></test>
      <edit name="family" mode="assign" binding="same">
        <string>KacstQura</string>
      </edit>
    </match>
    <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="lang"><string>ar</string></test>
      <edit name="family" mode="assign" binding="same">
        <string>KacstQuraFixed</string>
      </edit>
    </match>
    <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</string></test>
      <test name="lang"><string>fa</string></test>
      <edit name="family" mode="assign" binding="same">
        <string>Roya</string>
      </edit>
    </match>
    <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="lang"><string>fa</string></test>
      <edit name="family" mode="assign" binding="same">
        <string>Nazli</string>
      </edit>
    </match>
    <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="lang"><string>fa</string></test>
      <edit name="family" mode="assign" binding="same">
        <string>Terafik</string>
      </edit>
    </match>
  </xsl:template>
</xsl:stylesheet>



--- NEW FILE dejavu-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/conf.d/20-DejaVu.conf

     Define aliasing for DejaVu

     © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
     This file is distributed under the terms of the GNU General
     Public License (GPL) version 2. Copies of the GPL can be obtained from:
     http://www.gnu.org/licenses/gpl.html
-->
<fontconfig>
<!--
  Declare to which generics each font belongs
-->
<!--
  Sans-serif faces
 -->
  <alias>
    <family>DejaVu Sans</family>
    <family>DejaVu Sans Condensed</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
<!--
  Serif faces
 -->
  <alias>
    <family>DejaVu Serif</family>
    <family>DejaVu Serif Condensed</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
<!--
  Monospace face
 -->
  <alias>
    <family>DejaVu Sans Mono</family>
    <default>
      <family>monospace</family>
    </default>
  </alias>
<!-- Declare DejaVu Sans a valid substitute for all known Bitstream Vera Sans
     derivatives which kept original metrics -->
  <alias>
    <family>Bitstream Vera Sans</family>
    <accept>
      <family>Bitstream Vera Sans</family>
      <family>DejaVu Sans</family>
    </accept>
  </alias>
  <alias>
    <family>Arev Sans</family>
    <accept>
      <family>Arev Sans</family>
      <family>DejaVu Sans</family>
    </accept>
  </alias>
  <alias>
    <family>SUSE Sans</family>
    <accept>
      <family>SUSE Sans</family>
      <family>DejaVu Sans</family>
    </accept>
  </alias>
  <alias>
    <family>Hunky Sans</family>
    <accept>
      <family>DejaVu Sans</family>
      <family>Hunky Sans</family>
    </accept>
  </alias>
  <alias>
    <family>Verajja</family>
    <accept>
      <family>DejaVu Sans</family>
      <family>Verajja</family>
    </accept>
  </alias>
  <alias>
    <family>Bepa</family>
    <accept>
      <family>DejaVu Sans</family>
      <family>Bepa</family>
    </accept>
  </alias>
  <alias>
    <family>Olwen Sans</family>
    <accept>
      <family>DejaVu Sans</family>
      <family>Olwen Sans</family>
    </accept>
  </alias>
<!-- Declare DejaVu Serif a valid substitute for all known Bitstream Vera Serif
     derivatives which kept the original metrics -->
  <alias>
    <family>Bitstream Vera Serif</family>
    <accept>
      <family>Bitstream Vera Serif</family>
      <family>DejaVu Serif</family>
    </accept>
  </alias>
  <alias>
    <family>SUSE Serif</family>
    <accept>
      <family>SUSE Serif</family>
      <family>DejaVu Serif</family>
    </accept>
  </alias>
  <alias>
    <family>Hunky Serif</family>
    <accept>
      <family>Hunky Serif</family>
      <family>DejaVu Serif</family>
    </accept>
  </alias>
  <alias>
    <family>Olwen Serif</family>
    <accept>
      <family>Olwen Serif</family>
      <family>DejaVu Serif</family>
    </accept>
  </alias>
<!-- Declare DejaVu Sans Mono a valid substitute for all known Bitstream Vera
     Sans Mono derivatives which kept the original metrics -->
  <alias>
    <family>Bitstream Vera Sans Mono</family>
    <accept>
      <family>Bitstream Vera Sans Mono</family>
      <family>DejaVu Sans Mono</family>
    </accept>
  </alias>
  <alias>
    <family>SUSE Sans Mono</family>
    <accept>
      <family>SUSE Sans Mono</family>
      <family>DejaVu Sans Mono</family>
    </accept>
  </alias>
  <alias>
    <family>Bepa Mono</family>
    <accept>
      <family>Bepa Mono</family>
      <family>DejaVu Sans Mono</family>
    </accept>
  </alias>
  <alias>
    <family>Olwen Sans Mono</family>
    <accept>
      <family>Olwen Sans Mono</family>
      <family>DejaVu Sans Mono</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE dejavu-fonts-makedefault.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<!-- Makes DejaVu fonts the fontconfig defaults
     © 2003-2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
     This file is distributed under the terms of the GNU General
     Public License (GPL) version 2. Copies of the GPL can be obtained from:
     http://www.gnu.org/licenses/gpl.html
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <xsl:strip-space elements="*"/>
  <xsl:output method="xml" indent="yes" encoding="UTF-8" doctype-system="fonts.dtd"/>
<!-- Preserve most nodes -->
  <xsl:template match="*" priority="0">
    <xsl:copy>
      <xsl:apply-templates select="@*"/>
      <xsl:apply-templates select="*|text()|comment()"/>
    </xsl:copy>
  </xsl:template>
<!-- Preserve attributes and comments -->
  <xsl:template match="@*|comment()">
    <xsl:copy/>
  </xsl:template>
<!-- Take care of alias priorities -->
<!-- Remove old priorities if they exist -->
  <xsl:template match="fontconfig/alias[family = 'serif']/prefer/family[.='DejaVu Serif']" priority="1"/>
  <xsl:template match="fontconfig/alias[family = 'sans-serif']/prefer/family[.='DejaVu Sans']" priority="1"/>
  <xsl:template match="fontconfig/alias[family = 'monospace']/prefer/family[.='DejaVu Sans Mono']" priority="1"/>
<!-- Register serif alias -->
  <xsl:template match="fontconfig/alias[family = 'serif']/prefer/family[1]" priority="1">
    <family>DejaVu Serif</family>
    <xsl:copy>
      <xsl:apply-templates select="@*"/>
      <xsl:apply-templates select="*|text()|comment()"/>
    </xsl:copy>
  </xsl:template>
<!-- Register sans-serif alias -->
  <xsl:template match="fontconfig/alias[family = 'sans-serif']/prefer/family[1]" priority="1">
    <family>DejaVu Sans</family>
    <xsl:copy>
      <xsl:apply-templates select="@*"/>
      <xsl:apply-templates select="*|text()|comment()"/>
    </xsl:copy>
  </xsl:template>
<!-- Register monospace alias -->
  <xsl:template match="fontconfig/alias[family = 'monospace']/prefer/family[1]" priority="1">
    <family>DejaVu Sans Mono</family>
    <xsl:copy>
      <xsl:apply-templates select="@*"/>
      <xsl:apply-templates select="*|text()|comment()"/>
    </xsl:copy>
  </xsl:template>
</xsl:stylesheet>


--- NEW FILE dejavu-fonts-persian-override.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/conf.d/00-dejavu-persian-override.conf

     Override DejaVu use in Persian

     © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
     This file is distributed under the terms of the GNU General
     Public License (GPL) version 2. Copies of the GPL can be obtained from:
     http://www.gnu.org/licenses/gpl.html
-->
<fontconfig>
  <match>
    <test name="family"><string>DejaVu Sans</string></test>
    <test name="lang"><string>fa</string></test>
    <edit name="family" mode="assign" binding="same">
      <string>Roya</string>
    </edit>
  </match>
  <match>
    <test name="family"><string>DejaVu Serif</string></test>
    <test name="lang"><string>fa</string></test>
    <edit name="family" mode="assign" binding="same">
      <string>Nazli</string>
    </edit>
  </match>
  <match>
    <test name="family"><string>DejaVu Sans Mono</string></test>
    <test name="lang"><string>fa</string></test>
    <edit name="family" mode="assign" binding="same">
      <string>Terafik</string>
    </edit>
  </match>
</fontconfig>


--- NEW FILE dejavu-fonts-unblock.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<!-- Blocks DejaVu use with Arabic and Persian
     © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
     This file is distributed under the terms of the GNU General
     Public License (GPL) version 2. Copies of the GPL can be obtained from:
     http://www.gnu.org/licenses/gpl.html
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <xsl:strip-space elements="*"/>
  <xsl:output method="xml" indent="yes" encoding="UTF-8" doctype-system="fonts.dtd"/>
<!-- Preserve most nodes -->
  <xsl:template match="*" priority="0">
    <xsl:copy>
      <xsl:apply-templates select="@*"/>
      <xsl:apply-templates select="*|text()|comment()"/>
    </xsl:copy>
  </xsl:template>
<!-- Preserve attributes and comments -->
  <xsl:template match="@*|comment()">
    <xsl:copy/>
  </xsl:template>
<!-- Remove our blocking code -->
  <xsl:template match="fontconfig/match[comment()[.='Added by dejavu-fonts-block']]" priority ="1"/>
</xsl:stylesheet>



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 May 2006 15:19:32 -0000	1.14
+++ .cvsignore	18 Jun 2006 10:30:05 -0000	1.15
@@ -1 +1 @@
-dejavu-sfd-2.6.tar.gz
+dejavu-sfd-20060618-945.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dejavu-fonts.spec	20 May 2006 15:19:32 -0000	1.21
+++ dejavu-fonts.spec	18 Jun 2006 10:30:05 -0000	1.22
@@ -1,7 +1,9 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define archiveversion  2.6
+%define alphatag	20060618svn945
+%define archiveversion  20060618-945
 %define fontdir         %{_datadir}/fonts/%{name}
+%define fontconfdir     %{_sysconfdir}/fonts
 %define xsldir          %{_datadir}/xml/%{name}
 
 # Let the perl Maintainer worry about Unicode.org data files (updates, licensing)
@@ -9,20 +11,32 @@
 %define UnicodeData	%(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.6.0
-Release:   1%{?dist}
+Version:   2.7.0
+Release:   0.18.%{alphatag}%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
 URL:       http://dejavu.sf.net/
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz
-Source1:   dejavu-fonts-register.xsl
+# Make DejaVu fonts the default in Sans, Serif and Monospace
+Source1:   %{name}-makedefault.xsl
+#  Substitute the glyphs of another font in Sans, Serif and Monospace for Arabic and Farsi
+Source2:   %{name}-block.xsl
+Source3:   %{name}-unblock.xsl
+# DejaVu fontconfig setup
+Source4:   %{name}-fontconfig.conf
+# Substitute the glyphs of another font in DejaVu for Farsi
+Source5:   %{name}-persian-override.conf
+# Substitute the glyphs of another font in DejaVu for Arabic
+Source6:   %{name}-arabic-override.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fontforge
 # The CPAN sources do not declare perl(Font::TTF)
 BuildRequires: perl-Font-TTF
 # Needed to compute unicode coverage
 BuildRequires: %{Blocks} %{UnicodeData}
+# If we add this the package will require fontconfig
+# Requires: %{fontconfdir}/conf.d
 BuildArch: noarch
 Conflicts: fontconfig < 2.3.93
 
@@ -31,7 +45,9 @@
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
 1.10. Its purpose is to provide a wider range of characters (see Current status
 page for more information) while maintaining the original look and feel through
-the process of collaborative develop
+the process of collaborative develop.
+
+This package includes the typefaces the DejaVu project considers mature.
 
 
 %package experimental
@@ -47,16 +63,41 @@
 experimental.
 
 
-%package fontconfig
-Group:    User Interface/X
-Summary:  Files needed to register DejaVu fonts in fontconfig aliases
-Requires: %{name} = %{version}-%{release}
-# Needed for fontconfig alias registration
-Requires:  %{_bindir}/xsltproc, /bin/mktemp, %{_sysconfdir}/fonts/fonts.conf
+%package makedefault
+Group:     User Interface/X
+Summary:   Files needed to make DejaVu the default fontconfig fonts 
+# Needed for xslt processing of %{fontconfdir}/fonts.conf
+Requires:  %{_bindir}/xsltproc, /bin/mktemp, %{fontconfdir}/fonts.conf
+Obsoletes: %{name}-fontconfig < 2.7.0-0.15
+Conflicts: %{name}-fontconfig < 2.7.0-0.15
 
+%description makedefault
 
-%description fontconfig
 This package will add DejaVu fonts to fontconfig aliases and keep them there.
+It will make DejaVu fonts the first choice if they're not already listed in
+the aliases, and keep their current rank otherwise.
+
+
+%package block
+Group:    User Interface/X
+Summary:  Files needed to block DejaVu use with some scripts
+Requires: %{fontconfdir}/conf.d
+# Needed for xslt processing of %{fontconfdir}/fonts.conf
+Requires: %{_bindir}/xsltproc, /bin/mktemp, %{fontconfdir}/fonts.conf
+
+%description block
+The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
+1.10. While their glyph coverage and quality is improving every release, they
+may not yet be suitable for intensive use for some scripts.
+
+This package will force substitution of DejaVu by other fonts when rendering
+one of these scripts. If you need to install it, you probably have
+some enhancement suggestions to make at
+https://bugs.freedesktop.org/enter_bug.cgi?product=DejaVu or
+dejavu-fonts at lists.sourceforge.net
+
+Requests for enhancements or fixes of the blocking code should go to
+https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora%20Extras
 
 
 %prep
@@ -91,7 +132,15 @@
 
 #xsl
 install -d -m 755 %{buildroot}%{xsldir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{xsldir}/register-%{name}.xsl
+install -p -m 644 %{SOURCE1} %{buildroot}%{xsldir}/makedefault.xsl
+install -p -m 644 %{SOURCE2} %{buildroot}%{xsldir}/block.xsl
+install -p -m 644 %{SOURCE3} %{buildroot}%{xsldir}/unblock.xsl
+
+# Fontconfig overrides for some scripts
+install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
+install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-DejaVu.conf
+install -m 0644 %{SOURCE5} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-persian-override.conf
+install -m 0644 %{SOURCE6} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-arabic-override.conf
 
 
 %clean
@@ -126,14 +175,35 @@
 fi
 
 
-# UGLY but safe and I hope won't be necessary soonish
-%triggerin fontconfig -- fontconfig, %{_sysconfdir}/fonts/fonts.conf
+### Triggers yes I know I'm mad
+
+# I hope this won't be necessary by FC6 time
+%triggerin makedefault -- fontconfig, %{fontconfdir}/fonts.conf
+if [ -w %{fontconfdir}/fonts.conf ] ; then
+  TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \
+  %{_bindir}/xsltproc --novalid --output $TMPFILE \
+    %{xsldir}/makedefault.xsl %{fontconfdir}/fonts.conf && \
+  /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
+if [ -w %{fontconfdir}/fonts.conf ] ; then
+  TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \
+  %{_bindir}/xsltproc --novalid --output $TMPFILE \
+    %{xsldir}/block.xsl %{fontconfdir}/fonts.conf && \
+  /bin/cat $TMPFILE > %{fontconfdir}/fonts.conf && /bin/rm $TMPFILE
+fi
+
 
-if [ -x %{_sysconfdir}/fonts/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}/register-%{name}.xsl %{_sysconfdir}/fonts/fonts.conf && \
-  /bin/cat $TMPFILE > %{_sysconfdir}/fonts/fonts.conf && /bin/rm $TMPFILE
+    %{xsldir}/unblock.xsl %{fontconfdir}/fonts.conf && \
+  /bin/cat $TMPFILE > %{fontconfdir}/fonts.conf && /bin/rm $TMPFILE
 fi
 
 
@@ -141,6 +211,8 @@
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
+%{fontconfdir}/conf.d/20-DejaVu.conf
+
 %dir %{fontdir}
 %{fontdir}/DejaVu*.ttf
 %exclude %{fontdir}/DejaVu*Condensed*.ttf
@@ -154,13 +226,63 @@
 %{fontdir}/DejaVuSerif-*Oblique.ttf
 
 
-%files fontconfig
+%files makedefault
 %defattr(0644,root,root,0755)
 %dir %{xsldir}
-%{xsldir}/register-%{name}.xsl
+%{xsldir}/makedefault.xsl
+
+
+%files block
+%defattr(0644,root,root,0755)
+
+%dir %{xsldir}
+%{xsldir}/block.xsl
+%{xsldir}/unblock.xsl
+
+%exclude %{fontconfdir}/conf.d/20-DejaVu.conf
+%{fontconfdir}/conf.d/*.conf
 
 
 %changelog
+* Sun Jun 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.18
+- update to 20060618-945 snapshot
+- tighten up obsoletes
+
+* Fri Jun 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.17
+- all behold the power of the alphatag
+
+* Wed Jun 14 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.15
+- update to 20060614-943 snapshot
+- do make dejavu the default in all cases when makedefault is installed
+- alias Vera derivatives merged in DejaVu
+- declare generics for all DejaVu faces
+- remove more stuff moved to %{fontconfdir}/conf.d from the xslts
+
+* 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
+
+* 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
+
+* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.8
+- complete and clean up the Vera aliasing
+
+* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.7
+- addition of fontconfig blocking for Arabic and Persian
+  (experimental but safe)
+- tweak of the fontconfig aliasing to make DejaVu fonts the highest prio
+  instead of following Vera ranking, and rename the subpackage accordingly
+
+* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.1
+- preparation to 2.7.0 based on the current dejavu snapshot
+
 * Mon May 15 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.6.0-1
 - 2.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	20 May 2006 15:19:32 -0000	1.14
+++ sources	18 Jun 2006 10:30:05 -0000	1.15
@@ -1 +1 @@
-aae0e562be59e57e791cd1a7273bfb8c  dejavu-sfd-2.6.tar.gz
+620c8efb696486e0bdc55706ed3ceaf0  dejavu-sfd-20060618-945.tar.gz


--- dejavu-fonts-register.xsl DELETED ---




More information about the fedora-extras-commits mailing list