rpms/dejavu-fonts/devel dejavu-fonts-arabic-override.conf, NONE, 1.1 dejavu-fonts-persian-override.conf, NONE, 1.1 dejavu-fonts-vera-aliases.conf, NONE, 1.1 dejavu-fonts-register.xsl, 1.2, 1.3 dejavu-fonts.spec, 1.24, 1.25 dejavu-arabic-override.conf, 1.1, NONE dejavu-persian-override.conf, 1.2, NONE
Nicolas Mailhot (nim)
fedora-extras-commits at redhat.com
Sun Jun 11 10:20:54 UTC 2006
Author: nim
Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19200/devel
Modified Files:
dejavu-fonts-register.xsl dejavu-fonts.spec
Added Files:
dejavu-fonts-arabic-override.conf
dejavu-fonts-persian-override.conf
dejavu-fonts-vera-aliases.conf
Removed Files:
dejavu-arabic-override.conf dejavu-persian-override.conf
Log Message:
auto-import dejavu-fonts-2.7.0-0.8.fc6 on branch devel from dejavu-fonts-2.7.0-0.8.fc6.src.rpm
clean up vera aliasing
--- 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-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-vera-aliases.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/conf.d/20-BitstreamVera-aliases.conf
Define some Bitstream Vera derivatives as aliases
© 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>
<alias>
<family>Bitstream Vera Sans</family>
<accept>
<family>Bitstream Vera Sans</family>
<family>DejaVu Sans</family>
<family>Arev Sans</family>
<family>SUSE Sans</family>
<family>Hunky Sans</family>
<family>Verajja</family>
<family>Bepa</family>
<family>Olwen Sans</family>
</accept>
</alias>
<alias>
<family>Bitstream Vera Serif</family>
<accept>
<family>Bitstream Vera Serif</family>
<family>DejaVu Serif</family>
<family>SUSE Serif</family>
<family>Hunky Serif</family>
<family>Olwen Serif</family>
</accept>
</alias>
<alias>
<family>Bitstream Vera Sans Mono</family>
<accept>
<family>Bitstream Vera Sans Mono</family>
<family>DejaVu Sans Mono</family>
<family>SUSE Sans Mono</family>
<family>Bepa Mono</family>
<family>Olwen Sans Mono</family>
</accept>
</alias>
</fontconfig>
Index: dejavu-fonts-register.xsl
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-register.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dejavu-fonts-register.xsl 9 Jun 2006 23:16:05 -0000 1.2
+++ dejavu-fonts-register.xsl 11 Jun 2006 10:20:54 -0000 1.3
@@ -91,37 +91,4 @@
</xsl:copy>
<family>DejaVu Sans Mono</family>
</xsl:template>
- <xsl:template match="fontconfig/alias[accept][position()=last()]" priority="1">
- <xsl:copy>
- <xsl:apply-templates select="@*"/>
- <xsl:apply-templates select="*|text()|comment()"/>
- </xsl:copy>
- <xsl:if test="not(/fontconfig/alias[family='Bitstream Vera Sans']/accept)">
- <alias>
- <family>Bitstream Vera Sans</family>
- <accept>
- <family>Bitstream Vera Sans</family>
- <family>DejaVu Sans</family>
- </accept>
- </alias>
- </xsl:if>
- <xsl:if test="not(/fontconfig/alias[family='Bitstream Vera Serif']/accept)">
- <alias>
- <family>Bitstream Vera Serif</family>
- <accept>
- <family>Bitstream Vera Serif</family>
- <family>DejaVu Serif</family>
- </accept>
- </alias>
- </xsl:if>
- <xsl:if test="not(/fontconfig/alias[family='Bitstream Vera Sans Mono']/accept)">
- <alias>
- <family>Bitstream Vera Sans Mono</family>
- <accept>
- <family>Bitstream Vera Sans Mono</family>
- <family>DejaVu Sans Mono</family>
- </accept>
- </alias>
- </xsl:if>
- </xsl:template>
</xsl:stylesheet>
Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dejavu-fonts.spec 10 Jun 2006 22:45:29 -0000 1.24
+++ dejavu-fonts.spec 11 Jun 2006 10:20:54 -0000 1.25
@@ -11,15 +11,16 @@
Name: dejavu-fonts
Version: 2.7.0
-Release: 0.6%{?dist}
+Release: 0.8%{?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
-Source2: dejavu-persian-override.conf
-Source3: dejavu-arabic-override.conf
+Source1: %{name}-register.xsl
+Source2: %{name}-vera-aliases.conf
+Source3: %{name}-persian-override.conf
+Source4: %{name}-arabic-override.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: fontforge
# The CPAN sources do not declare perl(Font::TTF)
@@ -121,11 +122,13 @@
#xsl
install -d -m 755 %{buildroot}%{xsldir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{xsldir}/
+install -p -m 644 %{SOURCE1} %{buildroot}%{xsldir}/register.xsl
# Fontconfig overrides for some scripts
install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
-install -m 0644 %{SOURCE2} %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d
+install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-BitstreamVera-aliases.conf
+install -m 0644 %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-persian-override.conf
+install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-arabic-override.conf
%clean
@@ -166,7 +169,7 @@
if [ -w %{fontconfdir}/fonts.conf ] ; then
TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \
%{_bindir}/xsltproc --novalid --output $TMPFILE \
- %{xsldir}/%{name}-register.xsl %{fontconfdir}/fonts.conf && \
+ %{xsldir}/register.xsl %{fontconfdir}/fonts.conf && \
/bin/cat $TMPFILE > %{fontconfdir}/fonts.conf && /bin/rm $TMPFILE
fi
@@ -175,6 +178,8 @@
%defattr(0644,root,root,0755)
%doc *.txt AUTHORS BUGS LICENSE NEWS README
+%{fontconfdir}/conf.d/20-BitstreamVera-aliases.conf
+
%dir %{fontdir}
%{fontdir}/DejaVu*.ttf
%exclude %{fontdir}/DejaVu*Condensed*.ttf
@@ -191,21 +196,23 @@
%files makedefault
%defattr(0644,root,root,0755)
%dir %{xsldir}
-%{xsldir}/%{name}-register.xsl
+%{xsldir}/register.xsl
%files block
%defattr(0644,root,root,0755)
+%exclude %{fontconfdir}/conf.d/20-BitstreamVera-aliases.conf
%{fontconfdir}/conf.d/*.conf
%changelog
-* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.6
+* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.8
- preparation to 2.7.0 based on the current dejavu snapshot
- 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
+- complete and clean up the Vera aliasing
* Mon May 15 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.6.0-1
- 2.6.0
--- dejavu-arabic-override.conf DELETED ---
--- dejavu-persian-override.conf DELETED ---
More information about the fedora-extras-commits
mailing list