From 8ba1010b911783f16bac0a110690b15ff4e4eef3 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 12 Feb 2024 12:29:51 +0100 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20set=20locate=20permanently=20in?= =?UTF-8?q?=20%lua=5Frequires?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: #2263837 Signed-off-by: Nils Philippsen --- lua-rpm-macros.spec | 5 ++++- macros.lua-srpm | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lua-rpm-macros.spec b/lua-rpm-macros.spec index 2e221d5..b1482bc 100644 --- a/lua-rpm-macros.spec +++ b/lua-rpm-macros.spec @@ -21,7 +21,7 @@ Name: lua-rpm-macros Version: 1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: The common Lua RPM macros License: MIT @@ -94,6 +94,9 @@ install -Dpm 0644 lua.attr %{buildroot}/%{_fileattrsdir}/lua.attr %changelog +* Mon Feb 12 2024 Nils Philippsen - 1-12 +- Don’t set locale permanently in %%lua_requires (#2263837) + * Thu Jan 25 2024 Fedora Release Engineering - 1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/macros.lua-srpm b/macros.lua-srpm index 8c6592b..ff643ad 100644 --- a/macros.lua-srpm +++ b/macros.lua-srpm @@ -5,6 +5,6 @@ Requires: lua(abi) = %{lua_version} \ %else \ Requires: lua >= %{lua_version} \ -Requires: lua < %{lua: os.setlocale('C'); print(string.sub(_VERSION, 5) + 0.1)} \ +Requires: lua < %{lua: locale=os.setlocale(nil); os.setlocale('C.utf8'); print(string.sub(_VERSION, 5) + 0.1; os.setlocale(locale))} \ %endif \ %{nil}