From 5a38bde9586fca4587d63cc984a9fd9f9d7e8771 Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@redhat.com>
Date: Aug 14 2012 18:02:47 +0000
Subject: Resolves:rh#847621 - better enabling autohinting by default


- Resolves:rh#847623 - fontconfig file isn't shipped in rpm
- Resolves:rh#847627 - Malformed fontconfig config file

---

diff --git a/jomolhari-fonts-fontconfig.conf b/jomolhari-fonts-fontconfig.conf
index 8a65047..e3e501f 100644
--- a/jomolhari-fonts-fontconfig.conf
+++ b/jomolhari-fonts-fontconfig.conf
@@ -12,11 +12,19 @@
 	<match>
 		<test name="lang">
 			<string>bo-cn</string>
-			<string>bo-in</string>
-			<string>bo</string>
-			<string>dz-bt</string>
-			<string>dz</string>
 		</test>
+		<test name="lang">
+                        <string>bo-in</string>
+                </test>
+		<test name="lang">
+                        <string>bo</string>
+                </test>
+		<test name="lang">
+                        <string>dz-bt</string>
+                </test>
+		<test name="lang">
+                        <string>dz</string>
+                </test>
 		<test name="family">
 			<string>serif</string>
 		</test>
@@ -24,5 +32,13 @@
 			<string>Jomolhari</string>
 		</edit>
 	</match>
+	<match target="font">
+	  <test name="family" ignore-blanks="yes">
+	    <string>Jomolhari</string>
+	  </test>
+	  <edit name="autohint" mode="assign">
+	    <bool>true</bool>
+	  </edit>
+        </match>
 </fontconfig>
 
diff --git a/jomolhari-fonts.spec b/jomolhari-fonts.spec
index a3df2f2..e0960b0 100644
--- a/jomolhari-fonts.spec
+++ b/jomolhari-fonts.spec
@@ -3,7 +3,7 @@
 
 Name:		%{fontname}-fonts
 Version:	0.003
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	Jomolhari a Bhutanese style font for Tibetan and Dzongkha
 
 Group:		User Interface/X
@@ -32,16 +32,29 @@ The font supports the standard combinations used in most texts.
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+
 for i in FONTLOG.txt OFL-FAQ.txt OFL.txt
 do
 	tr -d '\r' < $i > ${i}.tmp
 	mv -f ${i}.tmp $i
 done
 
-%_font_pkg *.ttf
+%_font_pkg -f 65-0-%{fontname}.conf *.ttf
 %doc FONTLOG.txt OFL-FAQ.txt OFL.txt
 
 %changelog
+* Tue Aug 14 2012 Parag <pnemade AT redhat DOT com> - 0.003-13
+- Resolves:rh#847621 - better enabling autohinting by default
+- Resolves:rh#847623 - fontconfig file isn't shipped in rpm
+- Resolves:rh#847627 - Malformed fontconfig config file
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.003-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild