From 95f98360962a5d6400e46fa98ea67921ace14a92 Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Tue, 28 Oct 2025 08:50:11 -0700
Subject: [PATCH] fix: sipa-fonts now oulls Laksaman for the fontconfig (#6930)
 (#6933)

---
 anda/fonts/sipa/15-supercede-sarabun.conf | 22 ----------------------
 anda/fonts/sipa/sipa-fonts.spec           | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 anda/fonts/sipa/15-supercede-sarabun.conf

diff --git a/anda/fonts/sipa/15-supercede-sarabun.conf b/anda/fonts/sipa/15-supercede-sarabun.conf
deleted file mode 100644
index 4253ad5d76..0000000000
--- a/anda/fonts/sipa/15-supercede-sarabun.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
-<fontconfig>
-  <description>Redirect requests for Sarabun to Sarabun New for proper cross-platform rendering</description>
-
-  <match target="pattern">
-    <test qual="any" name="family" compare="eq">
-        <string>Sarabun</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>TH Sarabun New</string>
-    </edit>
-  </match>
-  <match target="pattern">
-    <test qual="any" name="family" compare="eq">
-        <string>TH Sarabun</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>TH Sarabun New</string>
-    </edit>
-  </match>
-</fontconfig>
diff --git a/anda/fonts/sipa/sipa-fonts.spec b/anda/fonts/sipa/sipa-fonts.spec
index b4867433a7..6a4ca3801c 100644
--- a/anda/fonts/sipa/sipa-fonts.spec
+++ b/anda/fonts/sipa/sipa-fonts.spec
@@ -5,7 +5,7 @@
 # namespace
 %global fontorg th.or.sipa
 Version:		20200217
-Release:		6%{?dist}
+Release:		7%{?dist}
 URL:			https://www.nstda.or.th/home/news_post/thai-font/
 %global fontlicense       LicenseRef-DIP-SIPA AND OFL-1.1-RFN
 %global fontlicenses      LICENSE
@@ -22,7 +22,7 @@ Obsoletes:      sipa-fonts < 20200217-5
 Packager:       Cappy Ishihara <cappy@fyralabs.com>
 Summary:		Thai National Fonts collection
 Source0:		https://waa.inter.nstda.or.th/stks/pub/%(x=%version;echo ${x:0:4})/%version-13Fonts.zip
-
+Requires:       tlwg-laksaman-fonts
 
 # The packages were renamed
 Obsoletes:      th-baijam-fonts
@@ -48,7 +48,6 @@ Requires:       %{name}-all
 # and these fonts are an open-source, state-sponsored package
 # required for official Thai documentation
 License:		LicenseRef-DIP-SIPA
-Source1:        15-supercede-sarabun.conf
 Source2:        SIPA-LICENSE
 BuildRequires:  rpm_macro(fontpkg)
 Supplements:    (default-fonts-th)
@@ -66,7 +65,7 @@ BuildArch:		noarch
 
 %global fontfamily2        TH Sarabun New
 %global foundry2           %foundry1
-%global fontlicense        OFL-1.1-RFN
+%global fontlicense2       OFL-1.1-RFN
 %global fonts2             'TH Sarabun New'*.ttf
 %global fontsummary2       Revision of the %{fontfamily1} font family
 %global fontdescription2   %{common_description}
@@ -95,7 +94,6 @@ BuildArch:		noarch
 %global fontsummary6       %{fontfamily6} font family
 %global fontdescription6   %{common_description}
 
-
 %global fontfamily7        TH Charm of AU
 %global foundry7           Kanlayanamit Noraratphutthi
 %global fonts7             'TH Charm of AU'*.ttf
@@ -147,12 +145,17 @@ BuildArch:		noarch
 
 %fontpkg -a
 %fontmetapkg
+# pull in tlwg-laksaman-fonts
+# since this actually provides a fix for TH Sarabun
+# (#6929) (#2482)
+
 
 %prep
 %autosetup -n Fonts
 cp -v %{SOURCE2} LICENSE
 
 %build
+touch METAPKG
 mv "THSarabun Bold Italic.ttf"		"TH Sarabun Bold Italic.ttf"
 mv "THSarabun Bold.ttf"				"TH Sarabun Bold.ttf"
 mv "THSarabun BoldItalic.ttf"		"TH Sarabun BoldItalic.ttf"
@@ -166,13 +169,14 @@ mv "THSarabunNew.ttf"				"TH Sarabun New.ttf"
 
 %install
 %fontinstall -a
-install -Dm644 %{SOURCE1} %buildroot/%{_sysconfdir}/fonts/conf.d/15-supercede-sarabun.conf
 
 %check
 %fontcheck -a
 
+%files
+%license LICENSE
+
 %fontfiles -a
-%config(noreplace) %{_sysconfdir}/fonts/conf.d/15-supercede-sarabun.conf
 
 
 %changelog