From cabc4199a8e0ad3b991496c7d5817088f19811b9 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:07:54 +0100
Subject: [PATCH] timezone: remove post script to avoid messing /etc/localtime
 and /etc/timezone x86_64: remove nscd and memusagestat to hopefully silent
 multiling warning about missing 32bit libs [release 2.19-4mamba;Sat Aug 23
 2014]

---
 glibc.spec | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index 435087e..7f2cf07 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -111,7 +111,7 @@
 
 Name:          glibc
 Version:       2.19
-Release:       3mamba
+Release:       4mamba
 Summary:       The GNU libc libraries
 Group:         System/Libraries
 Vendor:        openmamba
@@ -607,6 +607,9 @@ cp %{buildroot}%{glibc_includedir}/gnu/stubs-32.h %{buildroot}/
 rm -rf %{buildroot}%{glibc_includedir}
 install -d -m0755 %{buildroot}%{glibc_includedir}/gnu/
 mv %{buildroot}/stubs-32.h %{buildroot}%{glibc_includedir}/gnu/stubs-32.h
+# multilib: remove unuseful files depending on other 32bit libraries
+rm -f %{buildroot}%{_bindir}/memusagestat
+rm -f %{buildroot}%{_sbindir}/nscd
 %endif
 
 # install rpc headers removed since glibc 2.14 but required by e.g. samba and libtirpc
@@ -654,21 +657,6 @@ rm -rf %{buildroot}%{glibc_datadir}/zoneinfo
 %post %{?multilib:multilib} -p /sbin/ldconfig
 %postun %{?multilib:multilib} -p /sbin/ldconfig
 
-%post -n timezone%{?multilib:-multilib}
-if [ -e %{_sysconfdir}/timezone ]; then
-   timezone=`cat %{_sysconfdir}/timezone`
-else
-   case ${LANG:0:2} in
-      it) timezone=Europe/Rome ;;
-      *)  timezone=UTC ;;
-   esac
-   echo $timezone > %{_sysconfdir}/timezone
-fi
-[ -L /etc/localtime ] && rm -f /etc/localtime
-[ /usr/share/zoneinfo/$timezone -nt /etc/localtime ] && \
-   cp /usr/share/zoneinfo/$timezone /etc/localtime
-exit 0
-
 %pre %{?multilib:multilib-}devel
 [ -L %{_includedir}/asm ] && rm -f %{_includedir}/asm
 
@@ -858,8 +846,10 @@ exit 0
 %{_bindir}/xtrace
 %if "%{glibc_target_cpu}" == "%{_build_cpu}"
 %{_bindir}/memusage
+%if "%{multilib}" != "1"
 %{_bindir}/memusagestat
 %endif
+%endif
 %{glibc_libdir}/audit/sotruss-lib.so
 #%{glibc_libexecdir}/pt_chown
 %{slibdir}/libmemusage.so
@@ -880,7 +870,9 @@ exit 0
 
 %files -n nscd%{?multilib:-multilib}
 %defattr(-,root,root)
+%if "%{multilib}" != "1"
 %{_sbindir}/nscd
+%endif
 %attr(0755,nscd,nscd) /var/log/nscd
 %config(noreplace) %{_sysconfdir}/logrotate.d/nscd
 %config(noreplace) %{_sysconfdir}/nscd.conf
@@ -907,6 +899,10 @@ exit 0
 %endif
 
 %changelog
+* Sat Aug 23 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.19-4mamba
+- timezone: remove post script to avoid messing /etc/localtime and /etc/timezone
+- x86_64: remove nscd and memusagestat to hopefully silent multiling warning about missing 32bit libs
+
 * Wed Jun 11 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.19-3mamba
 - fix %pre old %{_includedir}/asm symlink stuff