Accepting request 1132503 from M17N

OBS-URL: https://build.opensuse.org/request/show/1132503
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fonts-config?expand=0&rev=63

0001-Fix-typos-in-32-emoji-reject.conf-and-59-family-pref.patch

@@ -1,53 +0,0 @@
-From e167f66b80dc4511a614e6fe971261ff125d021b Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Tue, 28 Nov 2023 18:01:49 +0100
-Subject: [PATCH] Fix typos in 32-emoji-reject.conf and
- 59-family-prefer-lang-specific
-
-Fix typos as fc-cache complained:
-  Fontconfig error: "/etc/fonts/conf.d/32-emoji-reject.conf", line 27: mismatched tag
-  Fontconfig error: "/etc/fonts/conf.d/59-family-prefer-lang-specific-cjk.conf", line 165: mismatched tag
-  Fontconfig warning: "/etc/fonts/conf.d/59-family-prefer-lang-specific-cjk.conf", line 165: invalid attribute 'name'
-  Fontconfig warning: "/etc/fonts/conf.d/59-family-prefer-lang-specific-cjk.conf", line 165: invalid attribute 'mode'
----
- 32-emoji-reject.conf                    | 2 +-
- 59-family-prefer-lang-specific-cjk.conf | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/32-emoji-reject.conf b/32-emoji-reject.conf
-index b07d8e44ba82..134877428107 100644
---- a/32-emoji-reject.conf
-+++ b/32-emoji-reject.conf
-@@ -23,6 +23,6 @@
-           <string>Noto Emoji</string>
-         </patelt>
-       </pattern>
--    <rejectfont>
-+    </rejectfont>
-   </selectfont>
- </fontconfig>
-diff --git a/59-family-prefer-lang-specific-cjk.conf b/59-family-prefer-lang-specific-cjk.conf
-index 11aa96b27837..8692e103a519 100644
---- a/59-family-prefer-lang-specific-cjk.conf
-+++ b/59-family-prefer-lang-specific-cjk.conf
-@@ -162,7 +162,7 @@
-     </test>
-     <edit name="family" mode="prepend">
-       <string>Noto Serif SC</string>
--      <string>Noto Serif HK</stirng>
-+      <string>Noto Serif HK</string>
-       <string>Noto Serif TC</string>
-       <string>Noto Serif JP</string>
-       <string>Noto Serif KR</string>
-@@ -194,7 +194,7 @@
-     </test>
-     <edit name="family" mode="prepend">
-       <string>Noto Serif TC</string>
--      <string>Noto Serif HK</stirng>
-+      <string>Noto Serif HK</string>
-       <string>Noto Serif JP</string>
-       <string>Noto Serif KR</string>
-       <string>Noto Serif SC</string>
--- 
-2.35.3
-

fonts-config-20230604+git0.630c8206607c.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:834e6d2f0e14843cd05f7e5dedb82d50f37871f41b4f6cfb48a29616189e7016
-size 25760

fonts-config.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Dec 11 09:12:07 UTC 2023 - pgajdos@suse.com
+
+- version update to 20231210+git0.f7216ba
+  * Fix typos in 32-emoji-reject.conf and 59-family-prefer-lang-specific
+  * remove SEARCH_METRIC_COMPATIBLE sysconfig variable and infra around [bsc#1216356]
+- deleted patches
+  - 0001-Fix-typos-in-32-emoji-reject.conf-and-59-family-pref.patch (upstreamed)
+
 -------------------------------------------------------------------
 Tue Nov 28 16:38:44 UTC 2023 - Takashi Iwai <tiwai@suse.com>
 

fonts-config.spec

@@ -22,14 +22,13 @@
 %endif
 
 Name:           fonts-config
-Version:        20230604+git0.630c8206607c
+Version:        20231210+git0.f7216ba
 Release:        0
 Summary:        Script to configure fonts for X Windows and other applications
 # MIT for infinality
 License:        GPL-2.0-or-later AND MIT
 Group:          System/X11/Fonts
 Source:         %{name}-%{version}.tar.xz
-Patch1:         0001-Fix-typos-in-32-emoji-reject.conf-and-59-family-pref.patch
 BuildRequires:  fontconfig
 BuildRequires:  fontpackages-devel
 Requires(pre):  %fillup_prereq