From 428fed0f71649fae096b4f460559b23f5d928cd7 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Mon, 9 Oct 2017 16:00:03 +0800
Subject: [PATCH] Update to 0.6.4

---
 .gitignore                               |  1 +
 90-thai-scalable-synthetic-laksaman.conf | 27 +++++++++++++++++++
 sources                                  |  2 +-
 thai-scalable-fonts.spec                 | 34 ++++++++++++++++++++----
 thai-scalable-laksaman.metainfo.xml      |  8 ++++++
 5 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 90-thai-scalable-synthetic-laksaman.conf
 create mode 100644 thai-scalable-laksaman.metainfo.xml

diff --git a/.gitignore b/.gitignore
index 85fed46..9994b8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ thaifonts-scalable-0.4.12.tar.gz
 /thaifonts-scalable-0.4.16.tar.gz
 /thaifonts-scalable-0.4.17.tar.gz
 /fonts-tlwg-0.5.0.tar.gz
+/fonts-tlwg-0.6.4.tar.xz
diff --git a/90-thai-scalable-synthetic-laksaman.conf b/90-thai-scalable-synthetic-laksaman.conf
new file mode 100644
index 0000000..4e25713
--- /dev/null
+++ b/90-thai-scalable-synthetic-laksaman.conf
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<!-- Synthesize TH Sarabun with scaled-down Laksaman -->
+	<match target="pattern">
+		<test qual="any" name="family" compare="contains">
+			<string>TH Sarabun</string>
+		</test>
+		<edit name="family" mode="append" binding="same">
+			<string>Laksaman</string>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Laksaman</string>
+		</test>
+		<test target="pattern" qual="any" name="family" compare="contains">
+			<string>TH Sarabun</string>
+		</test>
+		<edit name="matrix" mode="assign">
+			<matrix>
+				<double>0.66</double><double>0</double>
+				<double>0</double><double>0.66</double>
+			</matrix>
+		</edit>
+	</match>
+</fontconfig>
diff --git a/sources b/sources
index 98e7db4..ccec702 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e407df4a9652aa1555e3dd5894d6ddd8  fonts-tlwg-0.5.0.tar.gz
+SHA512 (fonts-tlwg-0.6.4.tar.xz) = 43953f2a26dc89e0b0e5afc5a0733ba6807053cc144e1893ef5593a79c24342fc65aea22d9b0d1e2c0e6bffdf42481d1e89fbe83dd114572c02075b9a913db6a
diff --git a/thai-scalable-fonts.spec b/thai-scalable-fonts.spec
index a7cd45c..3bf537d 100644
--- a/thai-scalable-fonts.spec
+++ b/thai-scalable-fonts.spec
@@ -7,15 +7,16 @@
 %{archivename} provides a collection of free scalable Thai fonts.
 
 Name:      %{fontname}-fonts
-Version:   0.5.0
-Release:   13%{?dist}
+Version:   0.6.4
+Release:   1%{?dist}
 Summary:   Thai TrueType fonts
 License:   GPLv2+ and Bitstream Vera
 URL:       http://linux.thai.net/projects/thaifonts-scalable
-Source0:   http://linux.thai.net/pub/ThaiLinux/software/%{archivename}/%{archivename}-%{version}.tar.gz
+Source0:   http://linux.thai.net/pub/ThaiLinux/software/%{archivename}/%{archivename}-%{version}.tar.xz
 Source1:   %{fontconf}-garuda.conf
 Source2:   %{fontconf}-kinnari.conf
 Source3:   %{fontconf}-umpush.conf
+Source4:   %{fontconf}-laksaman.conf
 
 #Appdata Metainfo
 Source11:  %{fontname}-garuda.metainfo.xml
@@ -30,6 +31,7 @@ Source19:  %{fontname}-tlwgtpist.metainfo.xml
 Source20:  %{fontname}-tlwgtypo.metainfo.xml
 Source21:  %{fontname}-umpush.metainfo.xml
 Source22:  %{fontname}-waree.metainfo.xml
+Source23:  %{fontname}-laksaman.metainfo.xml
 
 
 BuildArch: noarch
@@ -198,6 +200,17 @@ This package provides the Umpush family of Thai fonts.
 %_font_pkg -n umpush -f %{fontconf}-umpush.conf Umpush*.ttf
 %{_datadir}/appdata/%{fontname}-umpush.metainfo.xml
 
+%package -n %{fontname}-laksaman-fonts
+Summary:        Thai Laksaman fonts
+Requires:       %{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-laksaman-fonts
+%common_desc
+
+This package provides the Laksaman family of Thai fonts.
+
+%_font_pkg -n laksaman -f %{fontconf}-laksaman.conf Laksaman*.ttf
+%{_datadir}/appdata/%{fontname}-laksaman.metainfo.xml
 
 %package -n %{fontname}-waree-fonts
 Summary:        Thai Waree fonts
@@ -229,7 +242,9 @@ make install DESTDIR=%{buildroot} INSTALL="install -p"
 
 # remove upstream font config
 # fontconfig's 65-nonlatin.conf covers 65-ttf-thai-tlwg.conf
-rm %{buildroot}%{_sysconfdir}/fonts/conf.avail/*-ttf-thai-tlwg*.conf
+rm %{buildroot}%{_sysconfdir}/fonts/conf.avail/64-15-laksaman.conf
+rm %{buildroot}%{_sysconfdir}/fonts/conf.avail/64-*-tlwg*.conf
+rm %{buildroot}%{_sysconfdir}/fonts/conf.avail/89-tlwg*-synthetic.conf
 
 # split up 90-ttf-thai-tlwg-synthetic.conf
 install -m 0644 -p %{SOURCE1} \
@@ -238,10 +253,13 @@ install -m 0644 -p %{SOURCE2} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-kinnari.conf
 install -m 0644 -p %{SOURCE3} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-umpush.conf
+install -m 0644 -p %{SOURCE4} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-laksaman.conf
 
 for fconf in %{fontconf}-garuda.conf \
              %{fontconf}-kinnari.conf \
-             %{fontconf}-umpush.conf ; do
+             %{fontconf}-umpush.conf \
+	     %{fontconf}-laksaman.conf ; do
   ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
@@ -271,12 +289,18 @@ install -Dm 0644 -p %{SOURCE21} \
         %{buildroot}%{_datadir}/appdata/%{fontname}-umpush.metainfo.xml
 install -Dm 0644 -p %{SOURCE22} \
         %{buildroot}%{_datadir}/appdata/%{fontname}-waree.metainfo.xml
+install -Dm 0644 -p %{SOURCE23} \
+        %{buildroot}%{_datadir}/appdata/%{fontname}-laksaman.metainfo.xml
 
 %files common
 %doc AUTHORS README COPYING NEWS
 
 
 %changelog
+* Mon Oct  9 2017 Peng Wu <pwu@redhat.com> - 0.6.4-1
+- Update to 0.6.4
+- add laksaman subpackage
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/thai-scalable-laksaman.metainfo.xml b/thai-scalable-laksaman.metainfo.xml
new file mode 100644
index 0000000..047cc12
--- /dev/null
+++ b/thai-scalable-laksaman.metainfo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
+<component type="font">
+  <id>thai-scalable-laksaman</id>
+  <metadata_license>CC-BY-3.0</metadata_license>
+  <extends>thai-scalable</extends>
+</component>
+