SPECS: sancho.spec - use ld.so.conf.d

[glen]

Author: glen                         Date: Thu Oct 20 13:33:31 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use ld.so.conf.d

---- Files affected:
SPECS:
   sancho.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/sancho.spec
diff -u SPECS/sancho.spec:1.13 SPECS/sancho.spec:1.14
--- SPECS/sancho.spec:1.13	Fri Sep  2 23:44:43 2005
+++ SPECS/sancho.spec	Thu Oct 20 15:33:25 2005
@@ -18,6 +18,7 @@
 # Source0-md5:	2c768e5f9f6da9c1d2fdb7ac5e06417b
 Source1:	%{name}.desktop
 URL:		http://sancho-gui.sourceforge.net/
+Requires:	glibc >= 6:2.3.5-7.6
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,27 +52,19 @@
 install distrib/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
+install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo '%{_libdir}/%{name}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-umask 022
-if ! grep -qs '^%{_libdir}/%{name}$' /etc/ld.so.conf ; then
-	echo "%{_libdir}/%{name}" >> /etc/ld.so.conf
-fi
-/sbin/ldconfig
-
-%postun
-umask 022
-if [ "$1" = '0' ]; then
-	grep -v '^%{_libdir}/%{name}$' /etc/ld.so.conf > /etc/ld.so.conf.new 2>/dev/null
-	mv -f /etc/ld.so.conf.new /etc/ld.so.conf
-fi
-/sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc distrib/AUTHORS distrib/ChangeLog distrib/README distrib/LICENSE.txt
+%verify(not md5 mtime size) /etc/ld.so.conf.d/*.conf
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/%{name}
 %{_datadir}/%{name}
@@ -84,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2005/10/20 13:33:25  glen
+- use ld.so.conf.d
+
 Revision 1.13  2005/09/02 21:44:43  paszczus
 - changed Version from 0.9.4 to 0.9.4.47
 - added missing libs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/sancho.spec?r1=1.13&r2=1.14&f=u