Author: tagoh
Update of /cvs/pkgs/rpms/vlgothic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6396
Modified Files:
.cvsignore sources vlgothic-fontconfig-gothic.conf
vlgothic-fontconfig-pgothic.conf vlgothic-fonts.spec
Log Message:
* Mon Dec 7 2009 Akira TAGOH <[email protected]> - 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)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 15 Jun 2009 11:21:07 -0000 1.4
+++ .cvsignore 7 Dec 2009 06:37:58 -0000 1.5
@@ -1,3 +1,4 @@
VLGothic-20090204.tar.bz2
VLGothic-20090422.tar.bz2
VLGothic-20090612.tar.bz2
+VLGothic-20091202.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 15 Jun 2009 11:21:08 -0000 1.4
+++ sources 7 Dec 2009 06:37:58 -0000 1.5
@@ -1 +1 @@
-2ae45ffcaf4fd75331eb582cfee6cc54 VLGothic-20090612.tar.bz2
+db66b71975c6ffc54ca37f0d13451e0a VLGothic-20091202.tar.bz2
Index: vlgothic-fontconfig-gothic.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/devel/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 7 Dec 2009 06:37:59 -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/devel/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 7 Dec 2009 06:37:59 -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/devel/vlgothic-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- vlgothic-fonts.spec 27 Jul 2009 06:56:34 -0000 1.6
+++ vlgothic-fonts.spec 7 Dec 2009 06:37:59 -0000 1.7
@@ -1,21 +1,23 @@
%define priority 66
+%define ppriority 65
%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
-Release: 2%{?dist}
+Version: 20091202
+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/%{archivename}.tar.bz2
+Source0:
http://osdn.dl.sourceforge.jp/vlgothic/44715/%{archivename}.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,20 @@ 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 Dec 7 2009 Akira TAGOH <[email protected]> - 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 <[email protected]>
- 20090612-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
_______________________________________________
Fedora-fonts-bugs-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/fedora-fonts-bugs-list
