rpms/vlgothic-fonts/F-11 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 vlgothic-fontconfig-gothic.conf, 1.1, 1.2 vlgothic-fontconfig-pgothic.conf, 1.1, 1.2 vlgothic-fonts.spec, 1.5, 1.6
Author: tagoh
Update of /cvs/pkgs/rpms/vlgothic-fonts/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25083
Modified Files: .cvsignore sources vlgothic-fontconfig-gothic.conf vlgothic-fontconfig-pgothic.conf vlgothic-fonts.spec Log Message: * Mon Mar 1 2010 Akira TAGOH tagoh@redhat.com - 20100126-1 - New upstream release. - Set the priority to 65-0 for vlgothic-p-fonts to avoid the effects of 65-nonlatin.conf and similarly 65-1 to vlgothic-fonts. (#476459)
Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-11/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 15 Jun 2009 11:58:31 -0000 1.4 +++ .cvsignore 1 Mar 2010 08:48:00 -0000 1.5 @@ -1,3 +1,4 @@ VLGothic-20090204.tar.bz2 VLGothic-20090422.tar.bz2 VLGothic-20090612.tar.bz2 +VLGothic-20100126.tar.bz2
Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-11/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 15 Jun 2009 11:58:31 -0000 1.4 +++ sources 1 Mar 2010 08:48:00 -0000 1.5 @@ -1 +1 @@ -2ae45ffcaf4fd75331eb582cfee6cc54 VLGothic-20090612.tar.bz2 +66b80e81cd8e0198b90c377f006f9669 VLGothic-20100126.tar.bz2
Index: vlgothic-fontconfig-gothic.conf =================================================================== RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-11/vlgothic-fontconfig-gothic.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- vlgothic-fontconfig-gothic.conf 10 Feb 2009 11:48:21 -0000 1.1 +++ vlgothic-fontconfig-gothic.conf 1 Mar 2010 08:48:00 -0000 1.2 @@ -1,38 +1,51 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> - <match target="font"> + <!-- Generic names rule --> + <alias> + <family>VL Gothic</family> + <default> + <family>monospace</family> + </default> + </alias> + <!-- NOTE: just for fallback - ideally better installing vlgothic-p-fonts --> + <alias> + <family>VL Gothic</family> + <default> + <family>sans-serif</family> + </default> + </alias> + <!-- Locale-specific overrides rule --> + <match> + <test name="lang"> + <string>ja-jp</string> + </test> <test name="family"> - <string>VL Gothic</string> + <string>monospace</string> </test> - <edit name="hinting" mode="assign"> - <bool>false</bool> + <edit name="family" mode="prepend" binding="same"> + <string>VL Gothic</string> </edit> </match> - + <!-- NOTE: just for fallback - ideally better installing vlgothic-p-fonts --> <match> <test name="lang"> <string>ja-jp</string> </test> <test name="family"> - <string>monospace</string> + <string>sans-serif</string> </test> <edit name="family" mode="prepend" binding="same"> <string>VL Gothic</string> </edit> </match> - - <alias> - <family>monospace</family> - <prefer> - <family>VL Gothic</family> - </prefer> - </alias> - - <alias> - <family>VL Gothic</family> - <default> - <family>monospace</family> - </default> - </alias> + <!-- disabling hinting rule --> + <match target="font"> + <test name="family"> + <string>VL Gothic</string> + </test> + <edit name="hinting" mode="assign"> + <bool>false</bool> + </edit> + </match> </fontconfig>
Index: vlgothic-fontconfig-pgothic.conf =================================================================== RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-11/vlgothic-fontconfig-pgothic.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- vlgothic-fontconfig-pgothic.conf 10 Feb 2009 11:48:21 -0000 1.1 +++ vlgothic-fontconfig-pgothic.conf 1 Mar 2010 08:48:00 -0000 1.2 @@ -1,15 +1,14 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> - <match target="font"> - <test name="family"> - <string>VL PGothic</string> - </test> - <edit name="hinting" mode="assign"> - <bool>false</bool> - </edit> - </match> - + <!-- Generic names rule --> + <alias> + <family>VL PGothic</family> + <default> + <family>sans-serif</family> + </default> + </alias> + <!-- Locale-specific overrides rule --> <match> <test name="lang"> <string>ja-jp</string> @@ -21,18 +20,13 @@ <string>VL PGothic</string> </edit> </match> - - <alias> - <family>sans-serif</family> - <prefer> - <family>VL PGothic</family> - </prefer> - </alias> - - <alias> - <family>VL PGothic</family> - <default> - <family>sans-serif</family> - </default> - </alias> + <!-- disabling hinting rule --> + <match target="font"> + <test name="family"> + <string>VL PGothic</string> + </test> + <edit name="hinting" mode="assign"> + <bool>false</bool> + </edit> + </match> </fontconfig>
Index: vlgothic-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-11/vlgothic-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- vlgothic-fonts.spec 15 Jun 2009 11:58:31 -0000 1.5 +++ vlgothic-fonts.spec 1 Mar 2010 08:48:00 -0000 1.6 @@ -1,21 +1,23 @@ -%define priority 66 +%define priority 65-1 +%define ppriority 65-0 %define fontname vlgothic %define archivename VLGothic-%{version} -%define fontconf %{priority}-%{fontname} +%define fontconf %{priority}-%{fontname}-gothic +%define pfontconf %{ppriority}-%{fontname}-pgothic %define common_desc \ VLGothic provides Japanese TrueType fonts from the Vine Linux project.\ Most of the glyphs are taken from the M+ and Sazanami Gothic fonts,\ but some have also been improved by the project.
Name: %{fontname}-fonts -Version: 20090612 +Version: 20100126 Release: 1%{?dist} Summary: Japanese TrueType font
License: mplus and BSD Group: User Interface/X URL: http://dicey.org/vlgothic -Source0: http://osdn.dl.sourceforge.jp/vlgothic/40480/%%7Barchivename%7D.tar.bz2 +Source0: http://osdn.dl.sourceforge.jp/vlgothic/45617/%%7Barchivename%7D.tar.bz2 Source1: %{fontname}-fontconfig-pgothic.conf Source2: %{fontname}-fontconfig-gothic.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,10 +72,10 @@ install -m 0644 -p *.ttf $RPM_BUILD_ROOT install -m 0755 -d $RPM_BUILD_ROOT%{_fontconfig_templatedir} \ $RPM_BUILD_ROOT%{_fontconfig_confdir}
-install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}-pgothic.conf -install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}-gothic.conf +install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{pfontconf}.conf +install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}.conf
-for fconf in %{fontconf}-pgothic.conf %{fontconf}-gothic.conf; do +for fconf in %{pfontconf}.conf %{fontconf}.conf; do ln -s %{_fontconfig_templatedir}/$fconf $RPM_BUILD_ROOT%{_fontconfig_confdir}/$fconf done
@@ -87,12 +89,28 @@ rm -rf ${RPM_BUILD_ROOT} %doc README* LICENSE* %dir %{_fontdir}
-%_font_pkg -f %{fontconf}-gothic.conf VL-Gothic-Regular.ttf +%_font_pkg -f %{fontconf}.conf VL-Gothic-Regular.ttf
-%_font_pkg -n p -f %{fontconf}-pgothic.conf VL-PGothic-Regular.ttf +%_font_pkg -n p -f %{pfontconf}.conf VL-PGothic-Regular.ttf
%changelog +* Mon Mar 1 2010 Akira TAGOH tagoh@redhat.com - 20100126-1 +- New upstream release. +- Set the priority to 65-0 for vlgothic-p-fonts to avoid the effects + of 65-nonlatin.conf and similarly 65-1 to vlgothic-fonts. (#476459) + +* Mon Dec 7 2009 Akira TAGOH tagoh@redhat.com - 20091202-1 +- New upstream release. +- Set the priority to 65 for vlgothic-p-fonts to override the rule in + vlgothic-fonts for sans-serif. +- Set the priority to 66 and contains both rules for sans-serif and monospace + to avoid picking up the unrelated fonts in Live. where doesn't have + vlgothic-p-fonts installed. (#544957) + +* Sun Jul 26 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 20090612-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Jun 15 2009 Akira TAGOH tagoh@redhat.com - 20090612-1 - New upstream release.
fonts-bugs@lists.fedoraproject.org
-
Akira TAGOH