5 changed files with 127 additions and 32 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/fonts-tlwg-0.6.5.tar.xz
+SOURCES/fonts-tlwg-0.7.2.tar.xz
--- a/.thai-scalable-fonts.metadata
+++ b/.thai-scalable-fonts.metadata
@ -1 +1 @@
-1b05b5595daf7f03811de0573ab72eb85973bcf9 SOURCES/fonts-tlwg-0.6.5.tar.xz
+07cdb99b4ccd4c1cf03be24c399718ac1489a855 SOURCES/fonts-tlwg-0.7.2.tar.xz
--- a/SOURCES/65-0-thai-scalable-norasi.conf
+++ b/SOURCES/65-0-thai-scalable-norasi.conf
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<match>
+  <test name="lang" compare="contains">
+    <string>th</string>
+  </test>
+  <test name="family">
+    <string>serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>Norasi</string>
+  </edit>
+</match>
+
+<alias>
+  <family>Norasi</family>
+  <default>
+    <family>serif</family>
+  </default>
+</alias>
+
+</fontconfig>
+
--- a/SOURCES/65-0-thai-scalable-waree.conf
+++ b/SOURCES/65-0-thai-scalable-waree.conf
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<match>
+  <test name="lang" compare="contains">
+    <string>th</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>Waree</string>
+  </edit>
+</match>
+
+<alias>
+  <family>Waree</family>
+  <default>
+    <family>sans-serif</family>
+  </default>
+</alias>
+
+</fontconfig>
+
--- a/SPECS/thai-scalable-fonts.spec
+++ b/SPECS/thai-scalable-fonts.spec
@ -1,5 +1,6 @@
 %global fontname thai-scalable
-%global fontconf 90-%{fontname}-synthetic
+%global fontconf1 90-%{fontname}-synthetic
+%global fontconf2 65-0-%{fontname}

 %global archivename fonts-tlwg

@ -7,16 +8,18 @@
 %{archivename} provides a collection of free scalable Thai fonts.

 Name:      %{fontname}-fonts
-Version:   0.6.5
-Release:   1%{?dist}
+Version:   0.7.2
+Release:   5%{?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.xz
-Source1:   %{fontconf}-garuda.conf
-Source2:   %{fontconf}-kinnari.conf
-Source3:   %{fontconf}-umpush.conf
-Source4:   %{fontconf}-laksaman.conf
+Source1:   %{fontconf1}-garuda.conf
+Source2:   %{fontconf1}-kinnari.conf
+Source3:   %{fontconf1}-umpush.conf
+Source4:   %{fontconf1}-laksaman.conf
+Source5:   %{fontconf2}-norasi.conf
+Source6:   %{fontconf2}-waree.conf

 #Appdata Metainfo
 Source11:  %{fontname}-garuda.metainfo.xml
@ -35,6 +38,7 @@ Source23:  %{fontname}-laksaman.metainfo.xml


 BuildArch: noarch
+BuildRequires: make
 BuildRequires: fontforge >= 20071110
 BuildRequires: fontpackages-devel

@ -49,7 +53,6 @@ Thai scalable fonts included here are:

 %package common
 Summary:   Common files of %{name}
-Group:     User Interface/X
 Requires:  fontpackages-filesystem

 %description common
@ -67,7 +70,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the Garuda family of Thai fonts.

-%_font_pkg -n garuda -f %{fontconf}-garuda.conf Garuda*.ttf
+%_font_pkg -n garuda -f %{fontconf1}-garuda.conf Garuda*.otf
 %{_datadir}/appdata/%{fontname}-garuda.metainfo.xml


@ -80,7 +83,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the Kinnari family of Thai fonts.

-%_font_pkg -n kinnari -f %{fontconf}-kinnari.conf Kinnari*.ttf
+%_font_pkg -n kinnari -f %{fontconf1}-kinnari.conf Kinnari*.otf
 %{_datadir}/appdata/%{fontname}-kinnari.metainfo.xml


@ -93,7 +96,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the Loma family of Thai fonts.

-%_font_pkg -n loma Loma*.ttf
+%_font_pkg -n loma Loma*.otf
 %{_datadir}/appdata/%{fontname}-loma.metainfo.xml


@ -106,7 +109,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the Norasi family of Thai fonts.

-%_font_pkg -n norasi Norasi*.ttf
+%_font_pkg -n norasi -f %{fontconf2}-norasi.conf Norasi*.otf
 %{_datadir}/appdata/%{fontname}-norasi.metainfo.xml


@ -119,7 +122,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the Purisa family of Thai fonts.

-%_font_pkg -n purisa Purisa*.ttf
+%_font_pkg -n purisa Purisa*.otf
 %{_datadir}/appdata/%{fontname}-purisa.metainfo.xml


@ -132,7 +135,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the Sawasdee family of Thai fonts.

-%_font_pkg -n sawasdee Sawasdee*.ttf
+%_font_pkg -n sawasdee Sawasdee*.otf
 %{_datadir}/appdata/%{fontname}-sawasdee.metainfo.xml


@ -145,7 +148,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the TlwgMono family of Thai fonts.

-%_font_pkg -n tlwgmono TlwgMono*.ttf
+%_font_pkg -n tlwgmono TlwgMono*.otf
 %{_datadir}/appdata/%{fontname}-tlwgmono.metainfo.xml


@ -158,7 +161,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the TlwgTypewriter family of Thai fonts.

-%_font_pkg -n tlwgtypewriter TlwgTypewriter*.ttf
+%_font_pkg -n tlwgtypewriter TlwgTypewriter*.otf
 %{_datadir}/appdata/%{fontname}-tlwgtypewriter.metainfo.xml


@ -171,7 +174,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the TlwgTypist family of Thai fonts.

-%_font_pkg -n tlwgtypist TlwgTypist*.ttf
+%_font_pkg -n tlwgtypist TlwgTypist*.otf
 %{_datadir}/appdata/%{fontname}-tlwgtpist.metainfo.xml


@ -184,7 +187,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the TlwgTypo family of Thai fonts.

-%_font_pkg -n tlwgtypo TlwgTypo*.ttf
+%_font_pkg -n tlwgtypo TlwgTypo*.otf
 %{_datadir}/appdata/%{fontname}-tlwgtypo.metainfo.xml


@ -197,7 +200,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the Umpush family of Thai fonts.

-%_font_pkg -n umpush -f %{fontconf}-umpush.conf Umpush*.ttf
+%_font_pkg -n umpush -f %{fontconf1}-umpush.conf Umpush*.otf
 %{_datadir}/appdata/%{fontname}-umpush.metainfo.xml

 %package -n %{fontname}-laksaman-fonts
@ -209,7 +212,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the Laksaman family of Thai fonts.

-%_font_pkg -n laksaman -f %{fontconf}-laksaman.conf Laksaman*.ttf
+%_font_pkg -n laksaman -f %{fontconf1}-laksaman.conf Laksaman*.otf
 %{_datadir}/appdata/%{fontname}-laksaman.metainfo.xml

 %package -n %{fontname}-waree-fonts
@ -221,7 +224,7 @@ Requires:       %{name}-common = %{version}-%{release}

 This package provides the Waree family of Thai fonts.

-%_font_pkg -n waree Waree*.ttf
+%_font_pkg -n waree -f %{fontconf2}-waree.conf Waree*.otf
 %{_datadir}/appdata/%{fontname}-waree.metainfo.xml


@ -230,7 +233,7 @@ This package provides the Waree family of Thai fonts.


 %build
-%configure --with-ttfdir=%{_fontdir} --enable-ttf
+%configure --with-otfdir=%{_fontdir}
 make


@ -248,18 +251,26 @@ rm %{buildroot}%{_datadir}/fontconfig/conf.avail/89-tlwg*-synthetic.conf

 # split up 90-ttf-thai-tlwg-synthetic.conf
 install -m 0644 -p %{SOURCE1} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-garuda.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}-garuda.conf
 install -m 0644 -p %{SOURCE2} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-kinnari.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}-kinnari.conf
 install -m 0644 -p %{SOURCE3} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-umpush.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}-umpush.conf
 install -m 0644 -p %{SOURCE4} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-laksaman.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}-laksaman.conf

-for fconf in %{fontconf}-garuda.conf \
-             %{fontconf}-kinnari.conf \
-             %{fontconf}-umpush.conf \
-	     %{fontconf}-laksaman.conf ; do
+# install 65-0-thai-scalable-*.conf
+install -m 0644 -p %{SOURCE5} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf2}-norasi.conf
+install -m 0644 -p %{SOURCE6} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf2}-waree.conf
+
+for fconf in %{fontconf1}-garuda.conf \
+             %{fontconf1}-kinnari.conf \
+             %{fontconf1}-umpush.conf \
+	     %{fontconf1}-laksaman.conf \
+	     %{fontconf2}-norasi.conf \
+	     %{fontconf2}-waree.conf; do
  ln -s %{_fontconfig_templatedir}/$fconf \
        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
@ -297,6 +308,42 @@ install -Dm 0644 -p %{SOURCE23} \


 %changelog
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.7.2-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.7.2-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu May  7 2020 Peng Wu <pwu@redhat.com> - 0.7.2-1
+- Update to 0.7.2
+- Switch to use OpenType Font Format
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 17 2019 Peng Wu <pwu@redhat.com> - 0.6.5-5
+- Use Waree for sans-serif and Norasi for serif
+
+* Mon Jul 15 2019 Peng Wu <pwu@redhat.com> - 0.6.5-4
+- Use Waree as default font for Thai language
+- Add 65-0-thai-scalable-waree.conf
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Thu Apr 26 2018 Peng Wu <pwu@redhat.com> - 0.6.5-1
 - Update to 0.6.5