Author: glen Date: Wed Oct 19 16:20:41 2005 GMT Module: SPECS Tag: AC-branch ---- Log message: - /etc/ld.so.conf.d support, trigger needs some work and *your* comments
---- Files affected: SPECS: glibc.spec (1.583.2.31 -> 1.583.2.32) ---- Diffs: ================================================================ Index: SPECS/glibc.spec diff -u SPECS/glibc.spec:1.583.2.31 SPECS/glibc.spec:1.583.2.32 --- SPECS/glibc.spec:1.583.2.31 Fri Oct 7 15:39:30 2005 +++ SPECS/glibc.spec Wed Oct 19 18:20:36 2005 @@ -79,7 +79,7 @@ Summary(uk): GNU libc ×ĹŇÓŚ§ 2.3 Name: glibc Version: 2.3.5 -Release: 7 +Release: 7.6 Epoch: 6 License: LGPL Group: Libraries @@ -1122,7 +1122,8 @@ bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} bzip2 -dc %{SOURCE6} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.cache -> $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf +install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d +echo 'include ld.so.conf.d/*.conf'> $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf rm -f $RPM_BUILD_ROOT%{_mandir}/hu/man7/man.7 :> $RPM_BUILD_ROOT/var/log/nscd @@ -1245,6 +1246,17 @@ %endif -/bin/mv %{_sysconfdir}/ld.so.conf.rpmsave %{_sysconfdir}/ld.so.conf +%if 0 +# as we're run from trigger, need not to care about being installed to empty directory structure? +# and need to to use postshell? this trigger needs to be on -misc package? +%endif +%ifarch %{x8664} ppc64 s390x sparc64 +%triggerpostun -n %{name}64 -p /sbin/postshell -- %{name}64 < 6:2.3.5-7.6 +%else +%triggerpostun -p /sbin/postshell -- %{name} < 6:2.3.5-7.6 +%endif +-/bin/sh -c "/bin/grep -qs 'include ld.so.conf.d/*.conf' /etc/ld.so.conf || echo 'include ld.so.conf.d/*.conf' >> /etc/ld.so.conf" + %post memusage -p /sbin/ldconfig %postun memusage -p /sbin/ldconfig @@ -1317,6 +1329,7 @@ %endif %{?with_localedb:%dir %{_libdir}/locale} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf +%dir %{_sysconfdir}/ld.so.conf.d %ghost %{_sysconfdir}/ld.so.cache #%files -n nss_dns @@ -1647,6 +1660,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.583.2.32 2005/10/19 16:20:36 glen +- /etc/ld.so.conf.d support, trigger needs some work and *your* comments + Revision 1.583.2.31 2005/10/07 13:39:30 qboosh - and more ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.583.2.31&r2=1.583.2.32&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit