From 2242cd4c0b718a9c58a755f6105cd0b172fc519e Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Tue, 13 Jun 2023 17:11:38 +0900
Subject: [PATCH] Fix a typo and correct dependencies

---
 langpacks.spec | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/langpacks.spec b/langpacks.spec
index 0dc27d1..adfd560 100644
--- a/langpacks.spec
+++ b/langpacks.spec
@@ -1,6 +1,6 @@
 Name:      langpacks
 Version:   4.0
-Release:   0.1%{?dist}
+Release:   0.2%{?dist}
 Summary:   Langpacks meta-package
 
 License:   GPL-2.0-or-later
@@ -588,7 +588,7 @@ local langpacks_package_list = {
    inputmethod="ibus-anthy",
    meta={ requires={},
           recommends={},
-           fedora_recommends={ "(uim-anthy) if uim)" }
+           fedora_recommends={ "(uim-anthy if uim)" }
    },
  },
  { lang="ka", langname="Georgian", default={
@@ -1289,11 +1289,11 @@ end
 --
 --Package template for langpacks-core-<lang>
 --
-local function defcorepkg(lang, langname, inputmethod)
+local function defcorepkg(lang, fontlang, langname, inputmethod)
   local templ = [[
 %package core-%{_lang}
 Summary: %{_langname} langpacks core meta-package
-Requires: default-fonts-extra-%{_lang}
+Requires: default-fonts-extra-%{_fontlang}
 %{?_req}
 
 %description core-%{_lang}
@@ -1305,12 +1305,14 @@ This package provides %{_langname} core langpacks packages.
 ]]
   inputmethod = (not(inputmethod) and "" or inputmethod)
   rpm.define("_lang " .. lang)
+  rpm.define("_fontlang " .. fontlang)
   rpm.define("_langname " .. langname)
   if inputmethod ~= "" then
     rpm.define("_req " .. "Requires: (" .. inputmethod .. " if xorg-x11-server-Xorg)\n")
   end
   print(rpm.expand(templ))
   rpm.undefine("_lang")
+  rpm.undefine("_fontlang")
   rpm.undefine("_langname")
   rpm.undefine("_req")
 end
@@ -1322,6 +1324,8 @@ local function deffontpkg(cat1, cat2, summary1, summary2, prov, deps)
   local templ = [[
 %package -n default-fonts-%{_cat1}-%{_cat2}
 Summary:    Metapackage to install %{_summary1} for %{_summary2}
+Obsoletes:  langpacks-core-font-%{_cat2} < %{version}-%{release}
+Provides:   langpacks-core-font-%{_cat2} = %{version}-%{release}
 %{?_req}
 
 %description -n default-fonts-%{_cat1}-%{_cat2}
@@ -1424,8 +1428,6 @@ for i = 1, #langpacks_package_list do
     end
 
     deps = build_deps("", "Requires", drop_duplicate(deps))
-    --Replace deprecated langpacks-core-fonts-*
-    deps = append_deprecated(deps, "langpacks-core-font-" .. lang)
   end
   if (tonumber(rpm.expand("%{fedora}")) ~= 0 and langpacks_package_list[i]["recommends"] ~= nil) then
     deps = build_deps(deps, "Recommends", drop_duplicate(langpacks_package_list[i]["recommends"]))
@@ -1435,7 +1437,7 @@ for i = 1, #langpacks_package_list do
   if lowerorth == normlang then
     deffontpkg("extra", lang, "extra fonts", langname, append_fontprov("", lang), deps)
   end
-  defcorepkg(lang, langname, im)
+  defcorepkg(lang, (lowerorth == normlang and lang or orth), langname, im)
 
   --Generate langpacks-* meta packages
   local metadeps = (tonumber(rpm.expand("%{fedora}")) ~= 0 and langpacks_package_list[i]["meta"]["fedora_requires"] ~= nil and langpacks_package_list[i]["meta"]["fedora_requires"] or langpacks_package_list[i]["meta"]["requires"])