From 2ddd142a6a2af8bfcd4e77fa2742ee16b4894d5d Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:07:56 +0100
Subject: [PATCH] glibc: require locales package [release 2.28-3mamba;Sun Sep
 23 2018]

---
 glibc.spec | 57 +++++++++++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 31 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index a310839..f05e45c 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -108,7 +108,7 @@
 
 Name:          glibc
 Version:       2.28
-Release:       1mamba
+Release:       3mamba
 Summary:       The GNU libc libraries
 Group:         System/Libraries
 Vendor:        openmamba
@@ -174,7 +174,13 @@ BuildRequires: libselinux-devel >= 1.22
 BuildRequires: libcap-devel
 %endif
 BuildRequires: kernelsanitisedheaders
+%ifarch %{ix86}
+Provides:      glibc-multilib.x86_64
+Obsoletes:     glibc-multilib.x86_64
+%endif
 Requires:      ldconfig = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      locales = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      glibc-utils = %{?epoch:%epoch:}%{version}-%{release}
 %systemd_requires
 Prefix:        %{_prefix}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
@@ -765,26 +771,6 @@ fi
 %if "%{_target_platform}" == "%{_host}"
 %files %{?multilib:multilib}
 %defattr(-,root,root)
-%if "%{multilib}" != "1"
-%{_sbindir}/iconvconfig
-%{_bindir}/catchsegv
-%{_bindir}/gencat
-%{_bindir}/getconf
-%{_bindir}/getent
-%{_bindir}/iconv
-%{_bindir}/ldd
-%ifarch %{ix86}
-%{_bindir}/lddlibc4
-%endif
-%{_bindir}/locale
-%{_bindir}/localedef
-%{_bindir}/makedb
-%{_bindir}/pldd
-#%{_bindir}/rpcgen
-%{_bindir}/sprof
-%{_bindir}/tzselect
-/sbin/sln
-%endif
 %config(noreplace) %{_sysconfdir}/rpc
 /%{slibdir}/*
 %exclude %{slibdir}/libmemusage.so
@@ -814,13 +800,6 @@ fi
 %{glibc_libexecdir}/getconf/XBS5_ILP32_OFFBIG*
 %endif
 %endif
-%ifnarch x86_64
-%dir %{glibc_libdir}/locale
-%{glibc_libdir}/locale/locale-archive
-%else
-%{_prefix}/lib/locale/locale-archive
-%endif
-%{_localstatedir}/db/Makefile
 %doc COPYING* LICENSES
 
 %if "%{build_profile}" == "1"
@@ -839,6 +818,7 @@ fi
 %exclude %{glibc_libdir}/lib*_p.a
 %endif
 %{_infodir}/*
+%{_localstatedir}/db/Makefile
 %doc ChangeLog
 %doc NEWS README*
 
@@ -856,7 +836,6 @@ fi
 
 %files %{?multilib:multilib-}utils
 %defattr(-,root,root)
-%if "%{multilib}" == "1"
 %{_sbindir}/iconvconfig
 %{_bindir}/catchsegv
 %{_bindir}/gencat
@@ -864,24 +843,28 @@ fi
 %{_bindir}/getent
 %{_bindir}/iconv
 %{_bindir}/ldd
+%ifarch %{ix86}
 %{_bindir}/lddlibc4
+%endif
 %{_bindir}/locale
 %{_bindir}/localedef
-#%{_bindir}/makedb
 %{_bindir}/pldd
 #%{_bindir}/rpcgen
 %{_bindir}/sprof
 %{_bindir}/tzselect
 /sbin/sln
-%endif
 %{_bindir}/mtrace
 %{_bindir}/pcprofiledump
 %{_bindir}/sotruss
 %{_bindir}/xtrace
 %if "%{glibc_target_cpu}" == "%{_build_cpu}"
 %{_bindir}/memusage
+%if "%{multilib}" == "1"
+%{_bindir}/lddlibc4
+%endif
 %if "%{multilib}" != "1"
 %{_bindir}/memusagestat
+%{_bindir}/makedb
 %endif
 %endif
 %{glibc_libdir}/audit/sotruss-lib.so
@@ -901,6 +884,12 @@ fi
 %files -n locales%{?multilib:-multilib} -f libc.lang
 %defattr(-,root,root)
 %{glibc_datadir}/locale/locale.alias
+%ifnarch x86_64
+%dir %{glibc_libdir}/locale
+%{glibc_libdir}/locale/locale-archive
+%else
+%{_prefix}/lib/locale/locale-archive
+%endif
 
 %files -n nscd%{?multilib:-multilib}
 %defattr(-,root,root)
@@ -933,6 +922,12 @@ fi
 %endif
 
 %changelog
+* Sun Sep 23 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 2.28-3mamba
+- glibc: require locales package
+
+* Fri Sep 21 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 2.28-2mamba
+- multiarch: move tools from glibc to glibc-utils and require it; ix86: obsolete glibc-multilib 
+
 * Wed Aug 01 2018 Automatic Build System <autodist@mambasoft.it> 2.28-1mamba
 - automatic version update by autodist