From 6165a0bc68fdb433dfa53fd7ed6ea51675dd2f5e Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: May 26 2010 08:21:47 +0000
Subject: - Improve the fontconfig config file to match ko-kr as well. (#586306)

- sync NVR and fixes from RHEL-6.

---

diff --git a/65-baekmuk-ttf-batang.conf b/65-baekmuk-ttf-batang.conf
deleted file mode 100644
index 3972867..0000000
--- a/65-baekmuk-ttf-batang.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <match>
-    <test name="lang">
-      <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>
diff --git a/65-baekmuk-ttf-dotum.conf b/65-baekmuk-ttf-dotum.conf
deleted file mode 100644
index 8b9a047..0000000
--- a/65-baekmuk-ttf-dotum.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <match>
-    <test name="lang">
-      <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>
diff --git a/65-baekmuk-ttf-gulim.conf b/65-baekmuk-ttf-gulim.conf
deleted file mode 100644
index 24d554a..0000000
--- a/65-baekmuk-ttf-gulim.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <match>
-    <test name="lang">
-      <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>
diff --git a/65-baekmuk-ttf-hline.conf b/65-baekmuk-ttf-hline.conf
deleted file mode 100644
index fdb78e0..0000000
--- a/65-baekmuk-ttf-hline.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-<!--
-  this conf file is intended empty
- -->
-</fontconfig>
diff --git a/baekmuk-ttf-batang.conf b/baekmuk-ttf-batang.conf
new file mode 100644
index 0000000..f51ccf4
--- /dev/null
+++ b/baekmuk-ttf-batang.conf
@@ -0,0 +1,22 @@
+<?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>
diff --git a/baekmuk-ttf-dotum.conf b/baekmuk-ttf-dotum.conf
new file mode 100644
index 0000000..4d51bb8
--- /dev/null
+++ b/baekmuk-ttf-dotum.conf
@@ -0,0 +1,22 @@
+<?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>
diff --git a/baekmuk-ttf-fonts.spec b/baekmuk-ttf-fonts.spec
index d180a77..bf918d0 100644
--- a/baekmuk-ttf-fonts.spec
+++ b/baekmuk-ttf-fonts.spec
@@ -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 TrueType fonts.
 
 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/baekmuk/
 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 typeface.
 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-serif typeface.
 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 Monospace typeface.
 %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 = %{version}-%{release}
 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 Korean TrueType fonts.
 %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 >= 1.13
 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@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.)
 
diff --git a/baekmuk-ttf-gulim.conf b/baekmuk-ttf-gulim.conf
new file mode 100644
index 0000000..69cc5cd
--- /dev/null
+++ b/baekmuk-ttf-gulim.conf
@@ -0,0 +1,22 @@
+<?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>
diff --git a/baekmuk-ttf-hline.conf b/baekmuk-ttf-hline.conf
new file mode 100644
index 0000000..fdb78e0
--- /dev/null
+++ b/baekmuk-ttf-hline.conf
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  this conf file is intended empty
+ -->
+</fontconfig>