SPECS (AC-branch): glibc.spec - we know we need to modify ld.so.co...

[glen]

Author: glen                         Date: Thu Oct 20 08:13:19 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- we know we need to modify ld.so.conf from trigger, so no conditionals

---- Files affected:
SPECS:
   glibc.spec (1.583.2.32 -> 1.583.2.33) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.32 SPECS/glibc.spec:1.583.2.33
--- SPECS/glibc.spec:1.583.2.32	Wed Oct 19 18:20:36 2005
+++ SPECS/glibc.spec	Thu Oct 20 10:13:13 2005
@@ -1255,7 +1255,8 @@
 %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"
+-cp -f /etc/ld.so.conf /etc/ld.so.conf.rpmsave
+-sed -i -e '1iinclude ld.so.conf.d/*.conf' /etc/ld.so.conf
 
 %post	memusage -p /sbin/ldconfig
 %postun memusage -p /sbin/ldconfig
@@ -1660,6 +1661,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.583.2.33  2005/10/20 08:13:13  glen
+- we know we need to modify ld.so.conf from trigger, so no conditionals
+
 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
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.583.2.32&r2=1.583.2.33&f=u