.gitignore

@@ -0,0 +1 @@
+SOURCES/fonts-tlwg-0.6.5.tar.xz

.thai-scalable-fonts.metadata

@@ -0,0 +1 @@
+1b05b5595daf7f03811de0573ab72eb85973bcf9 SOURCES/fonts-tlwg-0.6.5.tar.xz

SOURCES/90-thai-scalable-synthetic-garuda.conf

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<!-- Synthesize Windows Browallia with scaled-down Garuda -->
+	<match target="pattern">
+		<test qual="any" name="family" compare="contains">
+			<string>Browallia</string>
+		</test>
+		<edit name="family" mode="append" binding="same">
+			<string>Garuda</string>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Garuda</string>
+		</test>
+		<test target="pattern" qual="any" name="family" compare="contains">
+			<string>Browallia</string>
+		</test>
+		<edit name="matrix" mode="assign">
+			<matrix>
+				<double>0.68</double><double>0</double>
+				<double>0</double><double>0.68</double>
+			</matrix>
+		</edit>
+	</match>
+</fontconfig>

SOURCES/90-thai-scalable-synthetic-kinnari.conf

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<!-- Synthesize Windows Angsana with scaled-down Kinnari -->
+	<match target="pattern">
+		<test qual="any" name="family" compare="contains">
+			<string>Angsana</string>
+		</test>
+		<edit name="family" mode="append" binding="same">
+			<string>Kinnari</string>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Kinnari</string>
+		</test>
+		<test target="pattern" qual="any" name="family" compare="contains">
+			<string>Angsana</string>
+		</test>
+		<edit name="matrix" mode="assign">
+			<matrix>
+				<double>0.67</double><double>0</double>
+				<double>0</double><double>0.67</double>
+			</matrix>
+		</edit>
+	</match>
+</fontconfig>

SOURCES/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>

SOURCES/90-thai-scalable-synthetic-umpush.conf

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<!-- Synthesize Windows Cordia with scaled-down Umpush -->
+	<match target="pattern">
+		<test qual="any" name="family" compare="contains">
+			<string>Cordia</string>
+		</test>
+		<edit name="family" mode="append" binding="same">
+			<string>Umpush</string>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Umpush</string>
+		</test>
+		<test target="pattern" qual="any" name="family" compare="contains">
+			<string>Cordia</string>
+		</test>
+		<edit name="matrix" mode="assign">
+			<matrix>
+				<double>0.65</double><double>0</double>
+				<double>0</double><double>0.65</double>
+			</matrix>
+		</edit>
+	</match>
+</fontconfig>

SPECS/thai-scalable-fonts.spec

@@ -1,6 +1,5 @@
 %global fontname thai-scalable
-%global fontconf1 90-%{fontname}-synthetic
+%global fontconf 90-%{fontname}-synthetic
-%global fontconf2 68-%{fontname}
 
 %global archivename fonts-tlwg
 
@@ -8,18 +7,16 @@
 %{archivename} provides a collection of free scalable Thai fonts.
 
 Name:      %{fontname}-fonts
-Version:   0.7.3
+Version:   0.6.5
-Release:   5%{?dist}
+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.xz
-Source1:   %{fontconf1}-garuda.conf
+Source1:   %{fontconf}-garuda.conf
-Source2:   %{fontconf1}-kinnari.conf
+Source2:   %{fontconf}-kinnari.conf
-Source3:   %{fontconf1}-umpush.conf
+Source3:   %{fontconf}-umpush.conf
-Source4:   %{fontconf1}-laksaman.conf
+Source4:   %{fontconf}-laksaman.conf
-Source5:   %{fontconf2}-norasi.conf
-Source6:   %{fontconf2}-waree.conf
 
 #Appdata Metainfo
 Source11:  %{fontname}-garuda.metainfo.xml
@@ -38,7 +35,6 @@ Source23:  %{fontname}-laksaman.metainfo.xml
 
 
 BuildArch: noarch
-BuildRequires: make
 BuildRequires: fontforge >= 20071110
 BuildRequires: fontpackages-devel
 
@@ -53,6 +49,7 @@ Thai scalable fonts included here are:
 
 %package common
 Summary:   Common files of %{name}
+Group:     User Interface/X
 Requires:  fontpackages-filesystem
 
 %description common
@@ -70,7 +67,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Garuda family of Thai fonts.
 
-%_font_pkg -n garuda -f %{fontconf1}-garuda.conf Garuda*.otf
+%_font_pkg -n garuda -f %{fontconf}-garuda.conf Garuda*.ttf
 %{_datadir}/appdata/%{fontname}-garuda.metainfo.xml
 
 
@@ -83,7 +80,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Kinnari family of Thai fonts.
 
-%_font_pkg -n kinnari -f %{fontconf1}-kinnari.conf Kinnari*.otf
+%_font_pkg -n kinnari -f %{fontconf}-kinnari.conf Kinnari*.ttf
 %{_datadir}/appdata/%{fontname}-kinnari.metainfo.xml
 
 
@@ -96,7 +93,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Loma family of Thai fonts.
 
-%_font_pkg -n loma Loma*.otf
+%_font_pkg -n loma Loma*.ttf
 %{_datadir}/appdata/%{fontname}-loma.metainfo.xml
 
 
@@ -109,7 +106,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Norasi family of Thai fonts.
 
-%_font_pkg -n norasi -f %{fontconf2}-norasi.conf Norasi*.otf
+%_font_pkg -n norasi Norasi*.ttf
 %{_datadir}/appdata/%{fontname}-norasi.metainfo.xml
 
 
@@ -122,7 +119,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Purisa family of Thai fonts.
 
-%_font_pkg -n purisa Purisa*.otf
+%_font_pkg -n purisa Purisa*.ttf
 %{_datadir}/appdata/%{fontname}-purisa.metainfo.xml
 
 
@@ -135,7 +132,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Sawasdee family of Thai fonts.
 
-%_font_pkg -n sawasdee Sawasdee*.otf
+%_font_pkg -n sawasdee Sawasdee*.ttf
 %{_datadir}/appdata/%{fontname}-sawasdee.metainfo.xml
 
 
@@ -148,7 +145,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the TlwgMono family of Thai fonts.
 
-%_font_pkg -n tlwgmono TlwgMono*.otf
+%_font_pkg -n tlwgmono TlwgMono*.ttf
 %{_datadir}/appdata/%{fontname}-tlwgmono.metainfo.xml
 
 
@@ -161,7 +158,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the TlwgTypewriter family of Thai fonts.
 
-%_font_pkg -n tlwgtypewriter TlwgTypewriter*.otf
+%_font_pkg -n tlwgtypewriter TlwgTypewriter*.ttf
 %{_datadir}/appdata/%{fontname}-tlwgtypewriter.metainfo.xml
 
 
@@ -174,7 +171,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the TlwgTypist family of Thai fonts.
 
-%_font_pkg -n tlwgtypist TlwgTypist*.otf
+%_font_pkg -n tlwgtypist TlwgTypist*.ttf
 %{_datadir}/appdata/%{fontname}-tlwgtpist.metainfo.xml
 
 
@@ -187,7 +184,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the TlwgTypo family of Thai fonts.
 
-%_font_pkg -n tlwgtypo TlwgTypo*.otf
+%_font_pkg -n tlwgtypo TlwgTypo*.ttf
 %{_datadir}/appdata/%{fontname}-tlwgtypo.metainfo.xml
 
 
@@ -200,7 +197,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Umpush family of Thai fonts.
 
-%_font_pkg -n umpush -f %{fontconf1}-umpush.conf Umpush*.otf
+%_font_pkg -n umpush -f %{fontconf}-umpush.conf Umpush*.ttf
 %{_datadir}/appdata/%{fontname}-umpush.metainfo.xml
 
 %package -n %{fontname}-laksaman-fonts
@@ -212,7 +209,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Laksaman family of Thai fonts.
 
-%_font_pkg -n laksaman -f %{fontconf1}-laksaman.conf Laksaman*.otf
+%_font_pkg -n laksaman -f %{fontconf}-laksaman.conf Laksaman*.ttf
 %{_datadir}/appdata/%{fontname}-laksaman.metainfo.xml
 
 %package -n %{fontname}-waree-fonts
@@ -224,7 +221,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Waree family of Thai fonts.
 
-%_font_pkg -n waree -f %{fontconf2}-waree.conf Waree*.otf
+%_font_pkg -n waree Waree*.ttf
 %{_datadir}/appdata/%{fontname}-waree.metainfo.xml
 
 
@@ -233,7 +230,7 @@ This package provides the Waree family of Thai fonts.
 
 
 %build
-%configure --with-otfdir=%{_fontdir}
+%configure --with-ttfdir=%{_fontdir} --enable-ttf
 make
 
 
@@ -251,26 +248,18 @@ 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}/%{fontconf1}-garuda.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-garuda.conf
 install -m 0644 -p %{SOURCE2} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}-kinnari.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-kinnari.conf
 install -m 0644 -p %{SOURCE3} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}-umpush.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-umpush.conf
 install -m 0644 -p %{SOURCE4} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}-laksaman.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-laksaman.conf
 
-# install 65-0-thai-scalable-*.conf
+for fconf in %{fontconf}-garuda.conf \
-install -m 0644 -p %{SOURCE5} \
+             %{fontconf}-kinnari.conf \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf2}-norasi.conf
+             %{fontconf}-umpush.conf \
-install -m 0644 -p %{SOURCE6} \
+	     %{fontconf}-laksaman.conf ; do
-        %{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
@@ -308,54 +297,6 @@ install -Dm 0644 -p %{SOURCE23} \
 
 
 %changelog
-* Fri Feb  3 2023 Akira TAGOH <tagoh@redhat.com> - 0.7.3-5
-- Update fontconfig priority to 68 for
-  https://fedoraproject.org/wiki/Changes/NotoFontsForMoreLang
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Oct 25 2021 Peng Wu <pwu@redhat.com> - 0.7.3-1
-- Update to 0.7.3
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* 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
 

dead.package

@@ -1 +0,0 @@
-thai-scalable-fonts package is retired on branch c10s for BAKERY-412

tests/roles/custom-test-fonts/tasks/main.yml

@@ -1,48 +0,0 @@
----
-
-- block:
-  - name: language coverage
-    environment:
-      LANG: "en_US.UTF-8"
-    script: run-lang-coverage-test --lang "{{ item }}" {% if path_prefix is defined %} --path {{ path_prefix }} {% elif coverage.values is not defined or coverage[item].path_prefix is not defined %} {% else %} {{ '--path "' + (coverage[item].path_prefix | join('" --path "')) + '"' }} {% endif %} --artifactsdir "{{ remote_artifacts }}" {% if coverage.values is not defined or coverage[item].name is not defined %} {% else %} {{ "--name " + coverage[item].name }} {% endif %} {% if coverage.values is not defined or coverage[item].exclude is not defined %} {% else %} {{ '--exclude "' + (coverage[item].exclude | join('" --exclude "')) + '"' }} {% endif %} {% if coverage.values is not defined or coverage[item].include is not defined %} {% else %} {{ '--include "' + (coverage[item].include | join('" --include "')) + '"' }} {% endif %} {% if path_prefix is defined or coverage.values is defined and coverage[item].path_prefix is defined %} {% else %} {{ '--package "' + (required_packages|join('" --package "')) + '"' }} {% endif %}
-    with_items:
-    - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}"
-  - name: generic family assignment
-    environment:
-      LANG: "en_US.UTF-8"
-    when: families is defined
-    script: run-family-test --lang {{ item.lang }} --family '{{ item.family }}' --alias {{ item.alias }} --artifactsdir {{ remote_artifacts }} --package {{ package if item.package is not defined else item.package }}
-    with_items:
-    - "{{ families }}"
-
-  - name: Check the results
-    shell: |
-      log="{{ remote_artifacts }}/test.log"
-      if [ ! -f "$log" ]; then
-          echo ERROR
-          echo "Test results not found." 1>&2
-      elif grep ^ERROR "$log" 1>&2; then
-          echo ERROR
-      elif grep ^FAIL "$log" 1>&2; then
-          echo FAIL
-      elif grep -q ^PASS "$log"; then
-          echo PASS
-      else
-          echo ERROR
-          echo "No test results found." 1>&2
-      fi
-    register: test_results
-
-  - name: Set role result
-    set_fact:
-      role_result: "{{ test_results.stdout }}"
-      role_message: "{{ test_results.stderr|d('test execution error.') }}"
-      role_result_failed: "{{ test_results.stdout != 'PASS' }}"
-      role_result_msg: "{{ test_results.stderr|d('test execution error.') }}"
-
-  - include_role:
-      name: str-common-final
-
-  - name: Validate the result
-    shell: echo "test_results.stdout"
-    failed_when: test_results.stdout != 'PASS'

tests/tests.yml

@@ -1,18 +0,0 @@
-- hosts: localhost
-  tags:
-    - classic
-  roles:
-    - role: custom-test-fonts
-      required_packages:
-        - thai-scalable-norasi-fonts
-      coverage:
-        th:
-          path_prefix:
-            - /usr/share/fonts/thai-scalable
-          include:
-            - Norasi.*otf
-      families:
-        - lang: th
-          package: thai-scalable-norasi-fonts
-          alias: sans-serif
-          family: Norasi

thai-arundina-sans.metainfo.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<component type="font">
-  <id>thai-arundina-sans</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <extends>thai-arundina</extends>
-</component>

thai-scalable.metainfo.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
-<component type="font">
-  <id>thai-scalable</id>
-  <metadata_license>CC-BY-3.0</metadata_license>
-  <name>TLWG</name>
-  <summary>A set of Thai fonts from the Thai Linux Working Group</summary>
-  <description>
-    <p>
-      Provides a collection of free scalable Thai fonts.
-    </p>
-  </description>
-  <updatecontact>pnemade_at_redhat_dot_com</updatecontact>
-  <url type="homepage">http://linux.thai.net/projects/thaifonts-scalable</url>
-</component>
-