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

[glen]

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

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

---- Diffs:

================================================================
Index: SPECS/sope.spec
diff -u SPECS/sope.spec:1.19 SPECS/sope.spec:1.20
--- SPECS/sope.spec:1.19	Wed Sep 14 12:54:14 2005
+++ SPECS/sope.spec	Thu Oct 20 15:26:13 2005
@@ -244,6 +244,7 @@
 Requires:	%{name}-xml = %{version}-%{release}
 Requires:	%{name}-core = %{version}-%{release}
 Requires:	%{name}-mime = %{version}-%{release}
+Requires:	glibc >= 6:2.3.5-7.6
 # should be autodetected
 #Requires:	libfoundation
 
@@ -541,27 +542,14 @@
 	GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{prefix}/System \
 	INSTALL_ROOT_DIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo '%{prefix}/lib' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-appserver.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post appserver
-if [ "$1" = "1" ]; then
-	if [ -d %{_sysconfdir}/ld.so.conf.d ]; then
-		echo "%{prefix}/lib" > %{_sysconfdir}/ld.so.conf.d/sope%{sope_major_version}%{sope_minor_version}.conf
-	elif [ ! "`grep '%{prefix}/lib' %{_sysconfdir}/ld.so.conf`" ]; then
-		echo "%{prefix}/lib" >> %{_sysconfdir}/ld.so.conf
-	fi
-	/sbin/ldconfig
-fi
-
-# ****************************** postun *********************************
-%postun appserver
-if [ "$1" = "0" ]; then
-	if [ -e %{_sysconfdir}/ld.so.conf.d/sope%{sope_major_version}%{sope_minor_version}.conf ]; then
-		rm -f %{_sysconfdir}/ld.so.conf.d/sope%{sope_major_version}%{sope_minor_version}.conf
-	fi
-	/sbin/ldconfig
-fi
+%post	appserver -p /sbin/ldconfig
+%postun	appserver -p /sbin/ldconfig
 
 %post	xml -p /sbin/ldconfig
 %postun	xml -p /sbin/ldconfig
@@ -633,6 +621,7 @@
 
 %files appserver
 %defattr(644,root,root,755)
+%verify(not md5 mtime size) /etc/ld.so.conf.d/%{name}-appserver.conf
 %attr(755,root,root) %{_libdir}/libNGObjWeb*.so.%{version}*
 %attr(755,root,root) %{_libdir}/libNGXmlRpc*.so.%{version}*
 %attr(755,root,root) %{_libdir}/libSoOFS*.so.%{version}*
@@ -741,6 +730,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2005/10/20 13:26:13  glen
+- use ld.so.conf.d
+
 Revision 1.19  2005/09/14 10:54:14  ankry
 - tabs
 
================================================================

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