commit 6284cb4b52328acbca3676379c48a2900e5270b5
Author: Daiki Ueno <ueno(a)unixuser.org>
Date: Wed Jul 4 17:52:08 2012 +0900
Update to 3.020-3.
nhn-nanum-fonts-brush-fontconfig.conf | 13 +------------
nhn-nanum-fonts-gothic-fontconfig.conf | 13 +------------
nhn-nanum-fonts-myeongjo-fontconfig.conf | 13 +------------
nhn-nanum-fonts-pen-fontconfig.conf | 13 +------------
nhn-nanum-fonts.spec | 5 ++++-
5 files changed, 8 insertions(+), 49 deletions(-)
---
diff --git a/nhn-nanum-fonts-brush-fontconfig.conf b/nhn-nanum-fonts-brush-fontconfig.conf
index fbf0e25..2aa84e3 100644
--- a/nhn-nanum-fonts-brush-fontconfig.conf
+++ b/nhn-nanum-fonts-brush-fontconfig.conf
@@ -2,18 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<match>
- <test name="lang">
- <string>ko-kr</string>
- </test>
- <test name="family">
- <string>cursive</string>
- </test>
- <edit name="family" mode="prepend">
- <string>Nanum Brush Script</string>
- </edit>
- </match>
- <match>
- <test name="lang">
+ <test name="lang" compare="contains">
<string>ko</string>
</test>
<test name="family">
diff --git a/nhn-nanum-fonts-gothic-fontconfig.conf b/nhn-nanum-fonts-gothic-fontconfig.conf
index f433f6e..74709a4 100644
--- a/nhn-nanum-fonts-gothic-fontconfig.conf
+++ b/nhn-nanum-fonts-gothic-fontconfig.conf
@@ -2,18 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<match>
- <test name="lang">
- <string>ko-kr</string>
- </test>
- <test name="family">
- <string>sans-serif</string>
- </test>
- <edit name="family" mode="prepend">
- <string>NanumGothic</string>
- </edit>
- </match>
- <match>
- <test name="lang">
+ <test name="lang" compare="contains">
<string>ko</string>
</test>
<test name="family">
diff --git a/nhn-nanum-fonts-myeongjo-fontconfig.conf b/nhn-nanum-fonts-myeongjo-fontconfig.conf
index f6ce10d..9da6b19 100644
--- a/nhn-nanum-fonts-myeongjo-fontconfig.conf
+++ b/nhn-nanum-fonts-myeongjo-fontconfig.conf
@@ -2,18 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<match>
- <test name="lang">
- <string>ko-kr</string>
- </test>
- <test name="family">
- <string>serif</string>
- </test>
- <edit name="family" mode="prepend">
- <string>NanumMyeongjo</string>
- </edit>
- </match>
- <match>
- <test name="lang">
+ <test name="lang" compare="contains">
<string>ko</string>
</test>
<test name="family">
diff --git a/nhn-nanum-fonts-pen-fontconfig.conf b/nhn-nanum-fonts-pen-fontconfig.conf
index 9a8001c..18a5464 100644
--- a/nhn-nanum-fonts-pen-fontconfig.conf
+++ b/nhn-nanum-fonts-pen-fontconfig.conf
@@ -2,18 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<match>
- <test name="lang">
- <string>ko-kr</string>
- </test>
- <test name="family">
- <string>cursive</string>
- </test>
- <edit name="family" mode="prepend">
- <string>Nanum Pen Script</string>
- </edit>
- </match>
- <match>
- <test name="lang">
+ <test name="lang" compare="contains">
<string>ko</string>
</test>
<test name="family">
diff --git a/nhn-nanum-fonts.spec b/nhn-nanum-fonts.spec
index 2a82675..8a35d24 100644
--- a/nhn-nanum-fonts.spec
+++ b/nhn-nanum-fonts.spec
@@ -9,7 +9,7 @@ publisher is NHN Corporation.
Name: %{fontname}-fonts
Version: 3.020
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Nanum family of Korean TrueType fonts
Group: User Interface/X
@@ -107,6 +107,9 @@ done
%changelog
+* Wed Jul 4 2012 Daiki Ueno <dueno(a)redhat.com> - 3.020-3
+- simplify the last change
+
* Wed Jul 4 2012 Daiki Ueno <dueno(a)redhat.com> - 3.020-2
- fix <test> usage in fontconfig files (Closes: #837521)