commit 69205baa82ecafa0e506d440cc44e925de35617c Author: Akira TAGOH <ta...@redhat.com> Date: Wed Jun 13 13:56:09 2012 +0900
Fix the order for substitute of Times New Roman. (#830849) linux-libertine-fonts-libertine-fontconfig.conf | 12 ------------ ...e-fonts-libertine-metrics-alias-fontconfig.conf | 17 +++++++++++++++++ linux-libertine-fonts.spec | 11 +++++++++-- 3 files changed, 26 insertions(+), 14 deletions(-) --- diff --git a/linux-libertine-fonts-libertine-fontconfig.conf b/linux-libertine-fonts-libertine-fontconfig.conf index ac3657f..9bef8c1 100644 --- a/linux-libertine-fonts-libertine-fontconfig.conf +++ b/linux-libertine-fonts-libertine-fontconfig.conf @@ -10,18 +10,6 @@ </alias> <!-- Font substitution --> <alias binding="same"> - <family>Times Roman</family> - <accept> - <family>Linux Libertine</family> - </accept> - </alias> - <alias binding="same"> - <family>Times New Roman</family> - <accept> - <family>Linux Libertine</family> - </accept> - </alias> - <alias binding="same"> <family>Linux Libertine O</family> <accept> <family>Linux Libertine</family> diff --git a/linux-libertine-fonts-libertine-metrics-alias-fontconfig.conf b/linux-libertine-fonts-libertine-metrics-alias-fontconfig.conf new file mode 100644 index 0000000..b030173 --- /dev/null +++ b/linux-libertine-fonts-libertine-metrics-alias-fontconfig.conf @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<fontconfig> + <!-- Font substitution --> + <alias binding="same"> + <family>Times Roman</family> + <accept> + <family>Linux Libertine</family> + </accept> + </alias> + <alias binding="same"> + <family>Times New Roman</family> + <accept> + <family>Linux Libertine</family> + </accept> + </alias> +</fontconfig> diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index a408b45..89d194c 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -3,6 +3,7 @@ %global prio_biolinum 61 %global fontconf_libertine %{prio_libertine}-%{fontname}-libertine.conf %global fontconf_biolinum %{prio_biolinum}-%{fontname}-biolinum.conf +%global fontconf_metrics 29-%{fontname}-metrics-alias.conf %global archivename LinLibertine %define posttag 2011_06_21 @@ -13,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.1.3 -Release: 1.%{posttag}%{?dist} +Release: 2.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -22,6 +23,7 @@ URL: http://linuxlibertine.sf.net Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC_%{version}_%{posttag}.tgz Source1: %{name}-libertine-fontconfig.conf Source2: %{name}-biolinum-fontconfig.conf +Source3: %{name}-libertine-metrics-alias-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -76,8 +78,10 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ install -m 0644 -p %{SOURCE1} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf_libertine} -install -m 0644 -p %{SOURCE1} \ +install -m 0644 -p %{SOURCE2} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf_biolinum} +install -m 0644 -p %{SOURCE3} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf_metrics} for fconf in %{fontconf_libertine} %{fontconf_biolinum}; do ln -s %{_fontconfig_templatedir}/$fconf \ @@ -96,6 +100,9 @@ rm -fr %{buildroot} %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.ttf %changelog +* Wed Jun 13 2012 Akira TAGOH <ta...@redhat.com> - 5.1.3-2.2011_06_21 +- Fix the order for substitute of Times New Roman. (#830849) + * Thu Apr 19 2012 Akira TAGOH <ta...@redhat.com> - 5.1.3-1.2011_06_21 - New upstream release. (#813730) _______________________________________________ fonts-bugs mailing list fonts-bugs@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/fonts-bugs http://fonts.fedoraproject.org/