rpms/dejavu-fonts/devel .cvsignore, 1.40, 1.41 dejavu-fonts-lgc-fontconfig-unhint-small.conf, 1.1, 1.2 dejavu-fonts-lgc-fontconfig.conf, 1.2, 1.3 dejavu-fonts.spec, 1.70, 1.71 sources, 1.40, 1.41 dejavu-fonts-makefile.patch, 1.2, NONE
Nicolas Mailhot (nim)
fedora-extras-commits at redhat.com
Thu Oct 25 18:32:17 UTC 2007
Author: nim
Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6444/devel
Modified Files:
.cvsignore dejavu-fonts-lgc-fontconfig-unhint-small.conf
dejavu-fonts-lgc-fontconfig.conf dejavu-fonts.spec sources
Removed Files:
dejavu-fonts-makefile.patch
Log Message:
more cleanups
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore 22 Oct 2007 19:16:34 -0000 1.40
+++ .cvsignore 25 Oct 2007 18:31:44 -0000 1.41
@@ -1 +1 @@
-dejavu-sfd-20071017-2019.tar.bz2
+dejavu-sfd-20071025-2022.tar.bz2
Index: dejavu-fonts-lgc-fontconfig-unhint-small.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-lgc-fontconfig-unhint-small.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dejavu-fonts-lgc-fontconfig-unhint-small.conf 22 Oct 2007 19:16:34 -0000 1.1
+++ dejavu-fonts-lgc-fontconfig-unhint-small.conf 25 Oct 2007 18:31:44 -0000 1.2
@@ -1,8 +1,17 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/20-unhint-small-dejavu-lgc.conf -->
<fontconfig>
- <!-- Turn off hinting at small sizes -->
+ <!-- /etc/fonts/conf.d/20-unhint-small-dejavu-lgc.conf
+
+ Disable hinting manually at smaller sizes (< 8ppem)
+ This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+ derived from Vera.
+
+ The Bistream Vera fonts have GASP entries suggesting that hinting be
+ disabled below 8 ppem, but FreeType ignores those, preferring to use
+ the data found in the instructed hints. The initial Vera release
+ didn't include the right instructions in the 'prep' table.
+ -->
<match target="font">
<test name="family">
<string>DejaVu LGC Sans</string>
Index: dejavu-fonts-lgc-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-lgc-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dejavu-fonts-lgc-fontconfig.conf 22 Oct 2007 19:16:34 -0000 1.2
+++ dejavu-fonts-lgc-fontconfig.conf 25 Oct 2007 18:31:44 -0000 1.3
@@ -1,8 +1,23 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/58-dejavu-lgc-fonts.conf -->
+<!-- /etc/fonts/conf.d/58-DejaVu LGC.conf
+
+ Define aliasing and other fontconfig settings for
+ DejaVu LGC
+
+ © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
<fontconfig>
- <!-- Alias Bitstream Vera -->
+ <!-- Declare DejaVu LGC Sans a valid substitute for all known Bitstream Vera Sans
+ derivatives which kept original metrics -->
+ <match>
+ <test name="family">
+ <string>Bitstream Prima Sans</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Sans</string>
+ </edit>
+ </match>
<match>
<test name="family">
<string>Bitstream Vera Sans</string>
@@ -13,24 +28,23 @@
</match>
<match>
<test name="family">
- <string>Bitstream Vera Serif</string>
+ <string>DejaVu Sans</string>
</test>
<edit name="family" mode="append" binding="same">
- <string>DejaVu LGC Serif</string>
+ <string>DejaVu LGC Sans</string>
</edit>
</match>
<match>
<test name="family">
- <string>Bitstream Vera Sans Mono</string>
+ <string>Arev Sans</string>
</test>
<edit name="family" mode="append" binding="same">
- <string>DejaVu LGC Sans Mono</string>
+ <string>DejaVu LGC Sans</string>
</edit>
</match>
- <!-- Alias DejaVu -->
<match>
<test name="family">
- <string>DejaVu Sans</string>
+ <string>SUSE Sans</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans</string>
@@ -38,6 +52,65 @@
</match>
<match>
<test name="family">
+ <string>Hunky Sans</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Sans</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Verajja</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Sans</string>
+ </edit>
+ </match>
+ <!-- In case VerajjaPDA stops declaring itself as Verajja -->
+ <match>
+ <test name="family">
+ <string>VerajjaPDA</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Sans</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Bepa</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Sans</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Olwen Sans</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Sans</string>
+ </edit>
+ </match>
+ <!-- Declare DejaVu LGC Serif a valid substitute for all known Bitstream Vera Serif
+ derivatives which kept the original metrics -->
+ <match>
+ <test name="family">
+ <string>Bitstream Prima Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Serif</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Bitstream Vera Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Serif</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
<string>DejaVu Serif</string>
</test>
<edit name="family" mode="append" binding="same">
@@ -46,6 +119,57 @@
</match>
<match>
<test name="family">
+ <string>SUSE Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Serif</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Hunky Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Serif</string>
+ </edit>
+ </match>
+ <!-- In case Verajja Serif stops declaring itself as DejaVu LGC Serif -->
+ <match>
+ <test name="family">
+ <string>Verajja Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Serif</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Olwen Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Serif</string>
+ </edit>
+ </match>
+ <!-- Declare DejaVu LGC Sans Mono a valid substitute for all known Bitstream Vera
+ Sans Mono derivatives which kept the original metrics -->
+ <match>
+ <test name="family">
+ <string>Bitstream Prima Sans Mono</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Sans Mono</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Bitstream Vera Sans Mono</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Sans Mono</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
<string>DejaVu Sans Mono</string>
</test>
<edit name="family" mode="append" binding="same">
@@ -54,12 +178,29 @@
</match>
<match>
<test name="family">
- <string>DejaVu Sans Light</string>
+ <string>SUSE Sans Mono</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Sans Mono</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Bepa Mono</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Sans Mono</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Olwen Sans Mono</string>
</test>
<edit name="family" mode="append" binding="same">
- <string>DejaVu LGC Sans Light</string>
+ <string>DejaVu LGC Sans Mono</string>
</edit>
</match>
+ <!-- Condensed families -->
<match>
<test name="family">
<string>DejaVu Sans Condensed</string>
@@ -70,12 +211,28 @@
</match>
<match>
<test name="family">
+ <string>Toga Sans</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Sans Condensed</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
<string>DejaVu Serif Condensed</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Serif Condensed</string>
</edit>
</match>
+ <match>
+ <test name="family">
+ <string>Toga Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu LGC Serif Condensed</string>
+ </edit>
+ </match>
<!-- Assign generic name -->
<alias>
<family>DejaVu LGC Sans</family>
Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- dejavu-fonts.spec 22 Oct 2007 19:16:34 -0000 1.70
+++ dejavu-fonts.spec 25 Oct 2007 18:31:44 -0000 1.71
@@ -1,13 +1,13 @@
%define fontname dejavu
-%define fontdir %{_datadir}/fonts/%{fontname}/
-%define fontconfdir %{_sysconfdir}/fonts/conf.d/
+%define fontdir %{_datadir}/fonts/%{fontname}
+%define fontconfdir %{_sysconfdir}/fonts/conf.d
%define archivename %{fontname}-sfd-%{archiveversion}
-%define alphatag .20071017svn2019
+%define alphatag .20071025svn2022
#define alphatag .rc1
-%define archiveversion 20071017-2019
+%define archiveversion 20071025-2022
#define archiveversion %{version}
@@ -17,7 +17,7 @@
Name: %{fontname}-fonts
Version: 2.21
-Release: 0.2%{?alphatag}%{?dist}
+Release: 0.3%{?alphatag}%{?dist}
Summary: DejaVu fonts, mature typefaces
Group: User Interface/X
@@ -35,8 +35,6 @@
Source5: %{name}-lgc-fontconfig.conf
Source6: %{name}-lgc-fontconfig-unhint-small.conf
-Patch0: %{name}-makefile.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Older fontforge versions will not work due to sfd format changes
BuildRequires: fontforge > 20070501
@@ -87,7 +85,6 @@
%prep
%setup -q -n %{archivename}
-%patch0 -p1 -b .make
%build
@@ -107,12 +104,12 @@
# Fontconfig tweaks
install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}57-%{fontname}.conf
-install -m 0644 -p %{SOURCE2} %{buildroot}%{fontconfdir}20-unhint-small-%{fontname}.conf
-install -m 0644 -p %{SOURCE3} %{buildroot}%{fontconfdir}61-%{fontname}-experimental.conf
-install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}20-unhint-small-%{fontname}-experimental.conf
-install -m 0644 -p %{SOURCE5} %{buildroot}%{fontconfdir}58-%{fontname}-lgc.conf
-install -m 0644 -p %{SOURCE6} %{buildroot}%{fontconfdir}20-unhint-small-%{fontname}-lgc.conf
+install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/57-%{fontname}.conf
+install -m 0644 -p %{SOURCE2} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}.conf
+install -m 0644 -p %{SOURCE3} %{buildroot}%{fontconfdir}/61-%{fontname}-experimental.conf
+install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}-experimental.conf
+install -m 0644 -p %{SOURCE5} %{buildroot}%{fontconfdir}/58-%{fontname}-lgc.conf
+install -m 0644 -p %{SOURCE6} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}-lgc.conf
%clean
@@ -121,42 +118,42 @@
%post
if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{fontdir}
+ %{_bindir}/fc-cache -f %{fontdir}
fi
%postun
if [ "$1" = "0" ]; then
if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{fontdir}
+ %{_bindir}/fc-cache -f %{fontdir}
fi
fi
%post experimental
if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{fontdir}
+ %{_bindir}/fc-cache -f %{fontdir}
fi
%postun experimental
if [ "$1" = "0" ]; then
if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{fontdir}
+ %{_bindir}/fc-cache -f %{fontdir}
fi
fi
%post -n %{fontname}-lgc-fonts
if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{fontdir}
+ %{_bindir}/fc-cache -f %{fontdir}
fi
%postun -n %{fontname}-lgc-fonts
if [ "$1" = "0" ]; then
if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{fontdir}
+ %{_bindir}/fc-cache -f %{fontdir}
fi
fi
@@ -167,8 +164,8 @@
%doc AUTHORS BUGS LICENSE NEWS README
%doc build/unicover.txt build/langcover.txt build/status.txt
-%config(noreplace) %{fontconfdir}20-unhint-small-%{fontname}.conf
-%config(noreplace) %{fontconfdir}57-%{fontname}.conf
+%config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}.conf
+%config(noreplace) %{fontconfdir}/57-%{fontname}.conf
%dir %{fontdir}
%{fontdir}/*.ttf
@@ -181,8 +178,8 @@
%files experimental
%defattr(0644,root,root,0755)
-%config(noreplace) %{fontconfdir}20-unhint-small-%{fontname}-experimental.conf
-%config(noreplace) %{fontconfdir}61-%{fontname}-experimental.conf
+%config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}-experimental.conf
+%config(noreplace) %{fontconfdir}/61-%{fontname}-experimental.conf
%{fontdir}/DejaVu*Condensed*.ttf
%{fontdir}/DejaVu*ExtraLight*.ttf
@@ -194,14 +191,21 @@
%doc AUTHORS BUGS LICENSE NEWS README
%doc build/unicover-lgc.txt build/langcover-lgc.txt
-%config(noreplace) %{fontconfdir}20-unhint-small-%{fontname}-lgc.conf
-%config(noreplace) %{fontconfdir}58-%{fontname}-lgc.conf
+%config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}-lgc.conf
+%config(noreplace) %{fontconfdir}/58-%{fontname}-lgc.conf
%dir %{fontdir}
%{fontdir}/DejaVuLGC*.ttf
%changelog
+* Wed Oct 25 2007 <nicolas.mailhot at laposte.net>
+☺ 2.21-0.3.20071025svn2022
+ ✓ Makefile patch dropped upstream
+ ✓ add -f to fc-cache calls
+ ✓ completely align LGC and FULL fontconfig rules
+ ✓ remove / from directory macros
+
* Sun Oct 21 2007 <nicolas.mailhot at laposte.net>
☢ 2.21-0.2.20071017svn2019
âš Still very experimental version:
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources 22 Oct 2007 19:16:34 -0000 1.40
+++ sources 25 Oct 2007 18:31:44 -0000 1.41
@@ -1 +1 @@
-f4f050827222c3e94d679c97e5e1cb1e dejavu-sfd-20071017-2019.tar.bz2
+6461152f93e7a0ea59b423bb343c8154 dejavu-sfd-20071025-2022.tar.bz2
--- dejavu-fonts-makefile.patch DELETED ---
More information about the scm-commits
mailing list