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]
This commit is contained in:
parent
ffb4bcc4c9
commit
cabc4199a8
28
glibc.spec
28
glibc.spec
@ -111,7 +111,7 @@
|
|||||||
|
|
||||||
Name: glibc
|
Name: glibc
|
||||||
Version: 2.19
|
Version: 2.19
|
||||||
Release: 3mamba
|
Release: 4mamba
|
||||||
Summary: The GNU libc libraries
|
Summary: The GNU libc libraries
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
@ -607,6 +607,9 @@ cp %{buildroot}%{glibc_includedir}/gnu/stubs-32.h %{buildroot}/
|
|||||||
rm -rf %{buildroot}%{glibc_includedir}
|
rm -rf %{buildroot}%{glibc_includedir}
|
||||||
install -d -m0755 %{buildroot}%{glibc_includedir}/gnu/
|
install -d -m0755 %{buildroot}%{glibc_includedir}/gnu/
|
||||||
mv %{buildroot}/stubs-32.h %{buildroot}%{glibc_includedir}/gnu/stubs-32.h
|
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
|
%endif
|
||||||
|
|
||||||
# install rpc headers removed since glibc 2.14 but required by e.g. samba and libtirpc
|
# 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
|
%post %{?multilib:multilib} -p /sbin/ldconfig
|
||||||
%postun %{?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
|
%pre %{?multilib:multilib-}devel
|
||||||
[ -L %{_includedir}/asm ] && rm -f %{_includedir}/asm
|
[ -L %{_includedir}/asm ] && rm -f %{_includedir}/asm
|
||||||
|
|
||||||
@ -858,8 +846,10 @@ exit 0
|
|||||||
%{_bindir}/xtrace
|
%{_bindir}/xtrace
|
||||||
%if "%{glibc_target_cpu}" == "%{_build_cpu}"
|
%if "%{glibc_target_cpu}" == "%{_build_cpu}"
|
||||||
%{_bindir}/memusage
|
%{_bindir}/memusage
|
||||||
|
%if "%{multilib}" != "1"
|
||||||
%{_bindir}/memusagestat
|
%{_bindir}/memusagestat
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
%{glibc_libdir}/audit/sotruss-lib.so
|
%{glibc_libdir}/audit/sotruss-lib.so
|
||||||
#%{glibc_libexecdir}/pt_chown
|
#%{glibc_libexecdir}/pt_chown
|
||||||
%{slibdir}/libmemusage.so
|
%{slibdir}/libmemusage.so
|
||||||
@ -880,7 +870,9 @@ exit 0
|
|||||||
|
|
||||||
%files -n nscd%{?multilib:-multilib}
|
%files -n nscd%{?multilib:-multilib}
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
%if "%{multilib}" != "1"
|
||||||
%{_sbindir}/nscd
|
%{_sbindir}/nscd
|
||||||
|
%endif
|
||||||
%attr(0755,nscd,nscd) /var/log/nscd
|
%attr(0755,nscd,nscd) /var/log/nscd
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/nscd
|
%config(noreplace) %{_sysconfdir}/logrotate.d/nscd
|
||||||
%config(noreplace) %{_sysconfdir}/nscd.conf
|
%config(noreplace) %{_sysconfdir}/nscd.conf
|
||||||
@ -907,6 +899,10 @@ exit 0
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Jun 11 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.19-3mamba
|
||||||
- fix %pre old %{_includedir}/asm symlink stuff
|
- fix %pre old %{_includedir}/asm symlink stuff
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user