SPECS: X11.spec - use ld.so.conf.d (extra fileutils/grep dep removed)

[glen]

Author: glen                         Date: Thu Oct 20 11:38:49 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use ld.so.conf.d (extra fileutils/grep dep removed)

---- Files affected:
SPECS:
   X11.spec (1.155 -> 1.156) 

---- Diffs:

================================================================
Index: SPECS/X11.spec
diff -u SPECS/X11.spec:1.155 SPECS/X11.spec:1.156
--- SPECS/X11.spec:1.155	Wed Oct 19 14:31:19 2005
+++ SPECS/X11.spec	Thu Oct 20 13:38:44 2005
@@ -32,7 +32,7 @@
 Summary(zh_CN):	XOrg X11 ´°żÚϾͳˇţÎńĆ÷şÍťůąžłĚĐň
 Name:		X11
 Version:	6.8.2
-Release:	11.11
+Release:	11.13
 Epoch:		1
 License:	MIT/X Consortium/BSD (see README)
 Group:		X11
@@ -1448,11 +1448,8 @@
 Summary(uk):	âŚÂĚŚĎÔĹËÉ ÓĐŚĚŘÎĎÇĎ ×ÉËĎŇÉÓÔÁÎÎŃ ÄĚŃ X Window System (X11R6.4)
 Group:		X11/Libraries
 Requires(post,postun):	/sbin/ldconfig
-Requires(post,postun):	grep
-# remove R: grep if R(post): grep starts to work
-Requires:	grep
-Requires(postun):	fileutils
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	glibc >= 6:2.3.5-7.6
 Provides:	XFree86-libs = %{epoch}:%{version}-%{release}
 Provides:	xcursor = 1.1.2
 Provides:	xft = 2.1.6
@@ -2165,10 +2162,13 @@
 # don't gzip README.* files, they are needed by XF86Setup
 gunzip $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/README.*
 
+install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/X11-libs.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#--- %post{un}, %preun, %verifyscript, %trigge ----------
+#--- %post{un}, %preun, %trigger ----------
 
 %post	DPS -p /sbin/ldconfig
 %postun DPS -p /sbin/ldconfig
@@ -2179,34 +2179,8 @@
 %post	OpenGL-libs -p /sbin/ldconfig
 %postun OpenGL-libs -p /sbin/ldconfig
 
-%post libs
-umask 022
-grep -qs "^%{_libdir}$" /etc/ld.so.conf
-[ $? -ne 0 ] && echo "%{_libdir}" >> /etc/ld.so.conf
-/sbin/ldconfig
-
-%postun libs
-if [ "$1" = "0" ]; then
-	umask 022
-	grep -v "%{_libdir}" /etc/ld.so.conf > /etc/ld.so.conf.new
-	mv -f /etc/ld.so.conf.new /etc/ld.so.conf
-fi
-/sbin/ldconfig
-
-%verifyscript libs
-echo -n "Looking for %{_libdir} in /etc/ld.so.conf... "
-if ! grep -q "^%{_libdir}$" /etc/ld.so.conf ; then
-	echo "missing"
-	echo "%{_libdir} missing from /etc/ld.so.conf" >&2
-else
-	echo "found"
-fi
-
-%triggerpostun libs -- XFree86-libs
-umask 022
-grep -qs "^%{_libdir}$" /etc/ld.so.conf
-[ $? -ne 0 ] && echo "%{_libdir}" >> /etc/ld.so.conf
-/sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %pre modules
 if [ -d /etc/X11/xkb/geometry/hp ]; then
@@ -2219,6 +2193,9 @@
 	ln -sf /etc/X11/xkb /usr/X11R6/lib/X11/xkb
 fi
 
+%triggerpostun libs -- X11-libs < 1:6.8.2-11.13
+sed -i -e "/^%(echo %{_libdir} | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf
+
 %post xdm
 /sbin/chkconfig --add xdm
 if [ -f /var/lock/subsys/xdm ]; then
@@ -3039,6 +3016,7 @@
 
 %files libs
 %defattr(644,root,root,755)
+%verify(not md5 mtime size) /etc/ld.so.conf.d/X11-libs.conf
 %dir %{_sysconfdir}/xdg
 %dir %{_themesdir}
 %dir %{_themesdir}/Default
@@ -3461,6 +3439,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156  2005/10/20 11:38:44  glen
+- use ld.so.conf.d (extra fileutils/grep dep removed)
+
 Revision 1.155  2005/10/19 12:31:19  glen
 - R: grep for -libs to fix install order (tested, works)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11.spec?r1=1.155&r2=1.156&f=u