SPECS: glibc.spec - merged ld.so.conf.d from AC-branch; release 8.1

[qboosh]

Author: qboosh                       Date: Fri Oct 21 07:29:27 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged ld.so.conf.d from AC-branch; release 8.1

---- Files affected:
SPECS:
   glibc.spec (1.608 -> 1.609) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.608 SPECS/glibc.spec:1.609
--- SPECS/glibc.spec:1.608	Fri Oct  7 15:40:24 2005
+++ SPECS/glibc.spec	Fri Oct 21 09:29:22 2005
@@ -77,7 +77,7 @@
 Summary(uk):	GNU libc ×ĹŇÓŚ§ 2.3
 Name:		glibc
 Version:	2.3.5
-Release:	2.2
+Release:	8.1
 Epoch:		6
 License:	LGPL
 Group:		Libraries
@@ -1124,7 +1124,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
@@ -1247,6 +1248,14 @@
 %endif
 -/bin/mv %{_sysconfdir}/ld.so.conf.rpmsave %{_sysconfdir}/ld.so.conf
 
+%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/cp -f /etc/ld.so.conf /etc/ld.so.conf.rpmsave
+-/bin/sed -i -e '1iinclude ld.so.conf.d/*.conf' /etc/ld.so.conf
+
 %post	memusage -p /sbin/ldconfig
 %postun memusage -p /sbin/ldconfig
 
@@ -1319,6 +1328,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
@@ -1649,6 +1659,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.609  2005/10/21 07:29:22  qboosh
+- merged ld.so.conf.d from AC-branch; release 8.1
+
 Revision 1.608  2005/10/07 13:40:24  qboosh
 - resync cosmetics with AC-branch
 
================================================================

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