public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Akira TAGOH <tagoh@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/google-noto-fonts] rawhide: Fix wrong obsoletes for google-noto-sans-balinese-fonts and google-noto-serif-myanmar-vf-fonts
Date: Thu, 03 Sep 2026 06:30:06 GMT	[thread overview]
Message-ID: <178841700631.1.1176290489616514105.rpms-google-noto-fonts-7a202a96b498@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/google-noto-fonts
Branch : rawhide
Commit : 7a202a96b4982e47e808d903b14f896a1f5fb560
Author : Akira TAGOH <tagoh@redhat.com>
Date   : 2026-09-03T15:29:04+09:00
Stats  : +28/-4 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/google-noto-fonts/c/7a202a96b4982e47e808d903b14f896a1f5fb560?branch=rawhide

Log:
Fix wrong obsoletes for google-noto-sans-balinese-fonts and google-noto-serif-myanmar-vf-fonts

---
diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec
index 65197cf..a718da1 100644
--- a/google-noto-fonts.spec
+++ b/google-noto-fonts.spec
@@ -453,9 +453,7 @@ local subpackages = {
     { alias="serif",      family="Serif Armenian", lang={ "hy" },
       default=true
     },
-    { alias="serif",      family="Serif Balinese", lang={ "ban" },
-      obsoletes={ "sans-balinese" }
-    },
+    { alias="serif",      family="Serif Balinese", lang={ "ban" } },
     { alias="serif",      family="Serif Bengali", lang={ "as", "bn", "mni" },
       default=true
     },
@@ -628,7 +626,7 @@ local subpackages = {
       default=true
     },
     { alias="sans-serif", variable=true, family="Sans Myanmar", lang={ "my" },
-      obsoletes={ "serif-myanmar-vf", "sans-myanmar-ui-vf" }
+      obsoletes={ "sans-myanmar-ui-vf" }
     },
     { alias="sans-serif", variable=true, family="Sans New Tai Lue", lang={ "khb" } },
     { alias="sans-serif", variable=true, family="Sans NKo Unjoined", lang={ "nqo" },
@@ -1084,6 +1082,32 @@ Requires:   %{name}-common = %{version}-%{release}
 %{_metainfodir}/]] .. metaname .. "\n"))
 end
 
+-- Sanity check: an obsoletes token expands into both a Provides: and an
+-- Obsoletes: of %{_fontname}-<token>-fonts. If <token> matches a real
+-- subpackage name, the obsoleting package would Provides/Obsoletes a live
+-- package, so google-noto-fonts-all's dependency on it gets satisfied by the
+-- wrong package and the real one is never pulled in. Fail the build early.
+local realpnames = {}
+for i = 1, #subpackages do
+    local t = subpackages[i]
+    local pname = string.lower(t.family):gsub(' ', '-') .. (t.variable and '-vf' or '')
+    realpnames[pname] = true
+end
+local dups = ''
+for i = 1, #subpackages do
+    local t = subpackages[i]
+    if t.obsoletes then
+        for j = 1, #t.obsoletes do
+            if realpnames[t.obsoletes[j]] then
+                dups = dups .. "\n  obsoletes '" .. t.obsoletes[j] .. "' in '" .. t.family .. "' collides with real subpackage " .. rpm.expand('%{_fontname}-') .. t.obsoletes[j] .. "-fonts"
+            end
+        end
+    end
+end
+if dups ~= '' then
+    error("Duplicate package name(s) via obsoletes:" .. dups)
+end
+
 local all_deps = ''
 local all_vf_deps = ''
 local all_static_deps = ''

                 reply	other threads:[~2026-09-03  6:30 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178841700631.1.1176290489616514105.rpms-google-noto-fonts-7a202a96b498@fedoraproject.org \
    --to=tagoh@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox