rpms/dejavu-fonts/devel dejavu-fonts-fontconfig.conf, NONE, 1.1 dejavu-fonts-makedefault.xsl, NONE, 1.1 .cvsignore, 1.15, 1.16 dejavu-fonts.spec, 1.29, 1.30 sources, 1.15, 1.16 dejavu-fonts-register.xsl, 1.3, NONE dejavu-fonts-vera-aliases.conf, 1.1, NONE
Nicolas Mailhot (nim)
fedora-extras-commits at redhat.com
Wed Jun 14 21:13:20 UTC 2006
Author: nim
Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3269/devel
Modified Files:
.cvsignore dejavu-fonts.spec sources
Added Files:
dejavu-fonts-fontconfig.conf dejavu-fonts-makedefault.xsl
Removed Files:
dejavu-fonts-register.xsl dejavu-fonts-vera-aliases.conf
Log Message:
auto-import dejavu-fonts-2.7.0-0.15.fc6 on branch devel from dejavu-fonts-2.7.0-0.15.fc6.src.rpm
new snapshot, more fontconfig setup work
--- 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>
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 9 Jun 2006 23:16:05 -0000 1.15
+++ .cvsignore 14 Jun 2006 21:13:20 -0000 1.16
@@ -1 +1 @@
-dejavu-sfd-20060608-938.tar.gz
+dejavu-sfd-20060614-943.tar.gz
Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dejavu-fonts.spec 11 Jun 2006 12:25:03 -0000 1.29
+++ dejavu-fonts.spec 14 Jun 2006 21:13:20 -0000 1.30
@@ -1,6 +1,6 @@
%define archivename dejavu-sfd
# This macro has the same value as %{version}, except when testing pre-release snapshots
-%define archiveversion 20060608-938
+%define archiveversion 20060614-943
%define fontdir %{_datadir}/fonts/%{name}
%define fontconfdir %{_sysconfdir}/fonts
%define xsldir %{_datadir}/xml/%{name}
@@ -11,17 +11,22 @@
Name: dejavu-fonts
Version: 2.7.0
-Release: 0.14%{?dist}
+Release: 0.15%{?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: %{name}-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
-Source4: %{name}-vera-aliases.conf
+# 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
@@ -125,13 +130,13 @@
#xsl
install -d -m 755 %{buildroot}%{xsldir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{xsldir}/register.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-BitstreamVera-aliases.conf
+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
@@ -170,12 +175,12 @@
### Triggers yes I know I'm mad
-# I hope this won't be necessary by FC6T1 time
+# 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}/register.xsl %{fontconfdir}/fonts.conf && \
+ %{xsldir}/makedefault.xsl %{fontconfdir}/fonts.conf && \
/bin/cat $TMPFILE > %{fontconfdir}/fonts.conf && /bin/rm $TMPFILE
fi
@@ -204,7 +209,7 @@
%defattr(0644,root,root,0755)
%doc *.txt AUTHORS BUGS LICENSE NEWS README
-%{fontconfdir}/conf.d/20-BitstreamVera-aliases.conf
+%{fontconfdir}/conf.d/20-DejaVu.conf
%dir %{fontdir}
%{fontdir}/DejaVu*.ttf
@@ -222,7 +227,7 @@
%files makedefault
%defattr(0644,root,root,0755)
%dir %{xsldir}
-%{xsldir}/register.xsl
+%{xsldir}/makedefault.xsl
%files block
@@ -232,11 +237,18 @@
%{xsldir}/block.xsl
%{xsldir}/unblock.xsl
-%exclude %{fontconfdir}/conf.d/20-BitstreamVera-aliases.conf
+%exclude %{fontconfdir}/conf.d/20-DejaVu.conf
%{fontconfdir}/conf.d/*.conf
%changelog
+* 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 9 Jun 2006 23:16:05 -0000 1.15
+++ sources 14 Jun 2006 21:13:20 -0000 1.16
@@ -1 +1 @@
-1c83f56c9905d6e85de85dda14196413 dejavu-sfd-20060608-938.tar.gz
+752534f586811b0ffae8c8b2d36acba5 dejavu-sfd-20060614-943.tar.gz
--- dejavu-fonts-register.xsl DELETED ---
--- dejavu-fonts-vera-aliases.conf DELETED ---
More information about the fedora-extras-commits
mailing list