SPECS: libc.spec - use ld.so.conf.d; rel 5

[glen]

Author: glen                         Date: Thu Oct 20 11:53:41 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use ld.so.conf.d; rel 5

---- Files affected:
SPECS:
   libc.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/libc.spec
diff -u SPECS/libc.spec:1.19 SPECS/libc.spec:1.20
--- SPECS/libc.spec:1.19	Mon Dec  1 03:53:25 2003
+++ SPECS/libc.spec	Thu Oct 20 13:53:36 2005
@@ -8,7 +8,7 @@
 Summary(tr):	Eski libc.so.5 uygulamalarý ile uyumlululuđu sađlayan kitaplýklar
 Name:		libc
 Version:	5.4.46
-Release:	4
+Release:	5
 License:	distributable
 Group:		Libraries
 #######		From Slackware libc.so.5 & libm.so.5
@@ -19,10 +19,10 @@
 # Source1:	ftp://ftp.kernel.org/pub/linux/libs/libc5/%{name}5.cvs.tar.bz2
 Source1:	ftp://ftp.kernel.org/pub/linux/libs/libc5/old/%{name}-%{version}.tar.bz2
 # Source1-md5:	3814ea25047461fee1130713d34869cc
-Requires(post):	grep
 Requires(post,postun):	/sbin/ldconfig
-Requires(postun):	fileutils
+Requires(triggerpostun):	sed >= 4.0
 Requires:	/lib/ld-linux.so.1
+Requires:	glibc >= 6:2.3.5-7.6
 Requires:	ld.so >= 1.9.9
 Provides:	libc.so.5
 Provides:	libm.so.5
@@ -100,26 +100,21 @@
 ln -sf ..%{_libdir}/libc5/libc.so.5.4.46 libc.so.5 ;\
 ln -sf ..%{_libdir}/libc5/libm.so.5.0.9 libm.so.5 )
 
+install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo '%{_libdir}/libc5' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-umask 022
-if ! grep -qs '^%{_libdir}/libc5$' /etc/ld.so.conf ; then
-	echo "%{_libdir}/libc5" >> /etc/ld.so.conf
-fi
-/sbin/ldconfig
-
-%postun
-umask 022
-/sbin/ldconfig
-if [ "$1" = '0' ]; then
-	grep -v '^%{_libdir}/libc5$' /etc/ld.so.conf > /etc/ld.so.conf.new 2>/dev/null
-	mv -f /etc/ld.so.conf.new /etc/ld.so.conf
-fi
+%post -p	/sbin/ldconfig
+%postun -p	/sbin/ldconfig
+
+%triggerpostun -- libc < 5.4.46-4.1
+sed -i -e "/^%(echo %{_libdir}/libc5 | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf
 
 %files
 %defattr(644,root,root,755)
+%verify(not md5 mtime size) /etc/ld.so.conf.d/*.conf
 %dir %{_libdir}/libc5
 %attr(755,root,root) %{_libdir}/libc5/*
 %attr(755,root,root) /lib/*
@@ -130,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2005/10/20 11:53:36  glen
+- use ld.so.conf.d; rel 5
+
 Revision 1.19  2003/12/01 02:53:25  undefine
 - release 4 to rebuild with ac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libc.spec?r1=1.19&r2=1.20&f=u