From fa5678ff5c54809bf4ecd7c489c9cbd484d5fedd Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Mon, 21 Oct 2024 10:25:03 +0200 Subject: [PATCH] format /usr/share/i18n/SUPPORTED as expected to fix locale.conf and locale.gen configuration with Calamares [release 2.40-5mamba;Sun Oct 20 2024] --- glibc.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/glibc.spec b/glibc.spec index f29d68e..798b2a3 100644 --- a/glibc.spec +++ b/glibc.spec @@ -87,7 +87,7 @@ Name: glibc Version: 2.40 -Release: 4mamba +Release: 5mamba Summary: The GNU libc libraries Group: System/Libraries Vendor: openmamba @@ -540,8 +540,11 @@ ln -s ../lib/locale %{buildroot}/usr/lib32/locale done popd # Add SUPPORTED file to package - install -m0644 localedata/SUPPORTED %{buildroot}%{glibc_datadir}/i18n/ - [-e %{buildroot}%{glibc_libdir}/libbsd-compat.a ] && ln -sf libbsd-compat.a %{buildroot}%{glibc_libdir}/libbsd.a + # Note: needs to be reformatted like /etc/locale.gen e.g. for Calamares + sed -e '1,3d' -e 's|/| |g' -e 's| \\||g' \ + localedata/SUPPORTED > %{buildroot}%{glibc_datadir}/i18n/SUPPORTED + +[-e %{buildroot}%{glibc_libdir}/libbsd-compat.a ] && ln -sf libbsd-compat.a %{buildroot}%{glibc_libdir}/libbsd.a %else # stage 1 make -C ../glibc-build-%{_target_platform} install-headers install_root=%{buildroot} cross-compiling=yes @@ -863,6 +866,9 @@ fi %endif %changelog +* Sun Oct 20 2024 Silvan Calarco 2.40-5mamba +- format /usr/share/i18n/SUPPORTED as expected to fix locale.conf and locale.gen configuration with Calamares + * Sun Oct 13 2024 Silvan Calarco 2.40-4mamba - move locale.gen configuration from glibc to glibc-utils to fix some upgrade failures cases