rpms/baekmuk-ttf-fonts/devel baekmuk-ttf-batang.conf, NONE, 1.1 baekmuk-ttf-dotum.conf, NONE, 1.1 baekmuk-ttf-gulim.conf, NONE, 1.1 baekmuk-ttf-hline.conf, NONE, 1.1 baekmuk-ttf-fonts.spec, 1.21, 1.22 65-baekmuk-ttf-batang.conf, 1.3, NONE 65-baekmuk-ttf-dotum.conf, 1.3, NONE 65-baekmuk-ttf-gulim.conf, 1.3, NONE 65-baekmuk-ttf-hline.conf, 1.1, NONE
Akira TAGOH
tagoh at fedoraproject.org
Wed May 26 08:21:47 UTC 2010
- Previous message: rpms/cjkuni-fonts/F-13 .cvsignore, 1.3, 1.4 cjkuni-fonts.spec, 1.24, 1.25 sources, 1.3, 1.4 cjkuni-fonts-0.2.20080216.1-18.patch, 1.1, NONE cjkuni-fonts-0.2.20080216.1-19.patch, 1.1, NONE cjkuni-fonts-uming-use-latin.patch, 1.1, NONE cjkunifonts-0.2.20080216.1-2.patch, 1.1, NONE
- Next message: [Bug 586306] Improve fontconfig config file
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tagoh
Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23461
Modified Files:
baekmuk-ttf-fonts.spec
Added Files:
baekmuk-ttf-batang.conf baekmuk-ttf-dotum.conf
baekmuk-ttf-gulim.conf baekmuk-ttf-hline.conf
Removed Files:
65-baekmuk-ttf-batang.conf 65-baekmuk-ttf-dotum.conf
65-baekmuk-ttf-gulim.conf 65-baekmuk-ttf-hline.conf
Log Message:
* Wed May 26 2010 Akira TAGOH <tagoh at redhat.com> - 2.2-28
- Improve the fontconfig config file to match ko-kr as well. (#586306)
- sync NVR and fixes from RHEL-6.
--- NEW FILE baekmuk-ttf-batang.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<match>
<test name="lang">
<string>ko-kr</string>
<string>ko</string>
</test>
<test name="family">
<string>serif</string>
</test>
<edit name="family" mode="prepend">
<string>Baekmuk Batang</string>
</edit>
</match>
<alias>
<family>Baekmuk Batang</family>
<default>
<family>serif</family>
</default>
</alias>
</fontconfig>
--- NEW FILE baekmuk-ttf-dotum.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<match>
<test name="lang">
<string>ko-kr</string>
<string>ko</string>
</test>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Baekmuk Dotum</string>
</edit>
</match>
<alias>
<family>Baekmuk Dotum</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>
--- NEW FILE baekmuk-ttf-gulim.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<match>
<test name="lang">
<string>ko-kr</string>
<string>ko</string>
</test>
<test name="family">
<string>monospace</string>
</test>
<edit name="family" mode="prepend">
<string>Baekmuk Gulim</string>
</edit>
</match>
<alias>
<family>Baekmuk Gulim</family>
<default>
<family>monospace</family>
</default>
</alias>
</fontconfig>
--- NEW FILE baekmuk-ttf-hline.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
this conf file is intended empty
-->
</fontconfig>
Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- baekmuk-ttf-fonts.spec 21 Apr 2010 06:53:56 -0000 1.21
+++ baekmuk-ttf-fonts.spec 26 May 2010 08:21:47 -0000 1.22
@@ -1,4 +1,5 @@
-%define fontname baekmuk-ttf
+%global priority 65-0
+%global fontname baekmuk-ttf
%define archivename %{fontname}-%{version}
%define common_desc \
This package provides the free Korean TrueType fonts.
@@ -8,7 +9,7 @@ This package provides the free Korean Tr
Name: %{fontname}-fonts
Version: 2.2
-Release: 25%{?dist}
+Release: 28%{?dist}
Summary: Free Korean TrueType fonts
Group: User Interface/X
@@ -17,12 +18,13 @@ URL: http://kldp.net/projects
Source0: http://kldp.net/frs/download.php/1429/%{archivename}.tar.gz
Source1: FAPIcidfmap.ko
Source2: cidfmap.ko
-Source3: 65-baekmuk-ttf-batang.conf
-Source4: 65-baekmuk-ttf-dotum.conf
-Source5: 65-baekmuk-ttf-gulim.conf
-Source6: 65-baekmuk-ttf-hline.conf
+Source3: baekmuk-ttf-batang.conf
+Source4: baekmuk-ttf-dotum.conf
+Source5: baekmuk-ttf-gulim.conf
+Source6: baekmuk-ttf-hline.conf
-Obsoletes: fonts-korean < 2.2.23
+Obsoletes: fonts-korean <= 2.2-23
+Provides: fonts-korean = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -36,6 +38,7 @@ BuildRequires: ttmkfdir >= 3.0.6
Summary: Korean Baekmuk TrueType Batang typeface
Group: User Interface/X
Obsoletes: %{name}-batang < 2.2-13
+Provides: %{name}-batang = %{version}-%{release}
Requires: %{fontname}-fonts-common = %{version}-%{release}
%description -n %{fontname}-batang-fonts
@@ -49,6 +52,7 @@ Batang is Korean TrueType font in Serif
Summary: Korean Baekmuk TrueType Dotum typeface
Group: User Interface/X
Obsoletes: %{name}-dotum < 2.2-13
+Provides: %{name}-dotum = %{version}-%{release}
Requires: %{fontname}-fonts-common = %{version}-%{release}
%description -n %{fontname}-dotum-fonts
@@ -62,6 +66,7 @@ Dotum is Korean TrueType font in San-ser
Summary: Korean Baekmuk TrueType Gulim typeface
Group: User Interface/X
Obsoletes: %{name}-gulim < 2.2-13
+Provides: %{name}-gulim = %{version}-%{release}
Requires: %{fontname}-fonts-common = %{version}-%{release}
%description -n %{fontname}-gulim-fonts
@@ -74,7 +79,8 @@ Gulim is Korean TrueType font in Monospa
%package -n %{fontname}-hline-fonts
Summary: Korean Baekmuk TrueType Headline typeface
Group: User Interface/X
-Obsoletes: %{name}-hline < 2.2-13
+Obsoletes: %{name}-hline < 2.2-13
+Provides: %{name}-hline = %{version}-%{release}
Requires: %{fontname}-fonts-common = %{version}-%{release}
%description -n %{fontname}-hline-fonts
@@ -92,8 +98,6 @@ Requires: %{fontname}-batang-fonts
Requires: %{fontname}-dotum-fonts = %{version}-%{release}
Requires: %{fontname}-gulim-fonts = %{version}-%{release}
Requires: %{fontname}-hline-fonts = %{version}-%{release}
-Conflicts: baekmuk-ttf-fonts-common <= 2.2-18
-Obsoletes: baekmuk-ttf-fonts-common < 2.2-19
%description -n %{fontname}-fonts-ghostscript
%common_desc
@@ -108,9 +112,11 @@ This is ghostscript files for Baekmuk Ko
%package -n %{fontname}-fonts-common
Summary: Common files for Korean Baekmuk TrueType fonts
Group: User Interface/X
-Conflicts: fonts-korean < 2.2-5
Obsoletes: ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-5
Obsoletes: baekmuk-ttf-common-fonts < 2.2-17
+Provides: baekmuk-ttf-common-fonts = %{version}-%{release}
+Provides: fonts-korean = %{version}-%{release}
+Provides: ttfonts-ko = %{version}-%{release}
Requires: fontpackages-filesystem >= 1.13
BuildRequires: fontpackages-filesystem >= 1.13
@@ -120,7 +126,7 @@ BuildRequires: fontpackages-filesystem
This is common files for Baekmuk Korean TrueType fonts.
%files -n %{fontname}-fonts-common
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
%doc COPYRIGHT COPYRIGHT.ko README
%dir %{_fontdir}
%verify(not md5 size mtime) %{_fontdir}/fonts.dir
@@ -148,9 +154,9 @@ done
cd ../
for fconf in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}
do
- %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
- %__ln_s %{_fontconfig_templatedir}/`basename $fconf` \
- %{buildroot}%{_fontconfig_confdir}/`basename $fconf`
+ %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/%{priority}-$(basename $fconf)
+ %__ln_s %{_fontconfig_templatedir}/%{priority}-$(basename $fconf) \
+ %{buildroot}%{_fontconfig_confdir}/%{priority}-$(basename $fconf)
done
cd -
@@ -175,6 +181,10 @@ cd -
%__rm -rf %{buildroot}
%changelog
+* Wed May 26 2010 Akira TAGOH <tagoh at redhat.com> - 2.2-28
+- Improve the fontconfig config file to match ko-kr as well. (#586306)
+- sync NVR and fixes from RHEL-6.
+
* Wed Apr 21 2010 Caius 'kaio' Chance <k at kaio.me> - 2.2-25
- Resolves: rhbz#578017 (Remove binding="same" from conf files.)
--- 65-baekmuk-ttf-batang.conf DELETED ---
--- 65-baekmuk-ttf-dotum.conf DELETED ---
--- 65-baekmuk-ttf-gulim.conf DELETED ---
--- 65-baekmuk-ttf-hline.conf DELETED ---
- Previous message: rpms/cjkuni-fonts/F-13 .cvsignore, 1.3, 1.4 cjkuni-fonts.spec, 1.24, 1.25 sources, 1.3, 1.4 cjkuni-fonts-0.2.20080216.1-18.patch, 1.1, NONE cjkuni-fonts-0.2.20080216.1-19.patch, 1.1, NONE cjkuni-fonts-uming-use-latin.patch, 1.1, NONE cjkunifonts-0.2.20080216.1-2.patch, 1.1, NONE
- Next message: [Bug 586306] Improve fontconfig config file
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fonts-bugs
mailing list