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

[glen]

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

---- Files affected:
SPECS:
   opengroupware.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/opengroupware.spec
diff -u SPECS/opengroupware.spec:1.11 SPECS/opengroupware.spec:1.12
--- SPECS/opengroupware.spec:1.11	Wed Sep 14 01:55:11 2005
+++ SPECS/opengroupware.spec	Thu Oct 20 15:41:31 2005
@@ -51,6 +51,7 @@
 BuildRequires:	sope-mime-devel
 BuildRequires:	sope-xml-devel
 BuildRequires:	gnustep-extensions-devel
+Requires:	glibc >= 6:2.3.5-7.6
 #Requires:	pilot-link
 Requires:	apache
 #Requires:	glibc
@@ -223,6 +224,7 @@
 %package tools
 Summary:	tools
 Group:		Libraries
+Requires:	glibc >= 6:2.3.5-7.6
 
 %description tools
 tools package.
@@ -565,6 +567,10 @@
 echo "PGCLIENTENCODING=\"LATIN1\"           # client encoding to use
 " >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{ZIDESTORE_SYSCONF}
 
+install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/opengroupware.conf
+echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/ogo.conf
+
 %pre
 if [ "$1" = "1" ]; then
 	%groupadd -g 157 "%{OGO_GROUP}"
@@ -595,14 +601,8 @@
 	Defaults write skyaptnotify AptNotifySkyrixPassword '\"\"'
 	Defaults write skyaptnotify AptNotifySkyrixUser root
 	"
-	##
-	if [ -d %{_sysconfdir}/ld.so.conf.d ]; then
-		echo "%{_libdir}" > %{_sysconfdir}/ld.so.conf.d/opengroupware.conf
-	elif [ ! "`grep '%{_libdir}' %{_sysconfdir}/ld.so.conf`" ]; then
-		echo "%{_libdir}" >> %{_sysconfdir}/ld.so.conf
-	fi
-	/sbin/ldconfig
 fi
+/sbin/ldconfig
 
 if [ "$1" = "2" ]; then
 	if [ -e %{_var}/log/opengroupware ]; then
@@ -623,29 +623,20 @@
 	if [ -h "%{_sysconfdir}/opengroupware.org" ]; then
 		rm %{_sysconfdir}/opengroupware.org
 	fi
-	if [ -e %{_sysconfdir}/ld.so.conf.d/opengroupware.conf ]; then
-		rm -f %{_sysconfdir}/ld.so.conf.d/opengroupware.conf
-	fi
-	/sbin/ldconfig
 fi
-
-%post docapi
 /sbin/ldconfig
 
-%post docapi-fs-project
-/sbin/ldconfig
+%post docapi -p /sbin/ldconfig
 
-%post docapi-db-project
-/sbin/ldconfig
+%post docapi-fs-project -p /sbin/ldconfig
 
-%post logic
-/sbin/ldconfig
+%post docapi-db-project -p /sbin/ldconfig
 
-%post webui-core
-/sbin/ldconfig
+%post logic -p /sbin/ldconfig
 
-%post webui-mailer
-/sbin/ldconfig
+%post webui-core -p /sbin/ldconfig
+
+%post webui-mailer -p /sbin/ldconfig
 
 %post tools
 if [ "$1" = "1" ]; then
@@ -726,14 +717,8 @@
 	chmod 754 %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}"
 	chkconfig --add "%{OGO_INIT_NAME}"
 	chkconfig "%{OGO_INIT_NAME}" on
-	##
-	if [ -d %{_sysconfdir}/ld.so.conf.d ]; then
-		echo "%{_libdir}" > %{_sysconfdir}/ld.so.conf.d/ogo.conf
-	elif [ ! "`grep '%{_libdir}' %{_sysconfdir}/ld.so.conf`" ]; then
-		echo "%{_libdir}" >> %{_sysconfdir}/ld.so.conf
-	fi
-	/sbin/ldconfig
 fi
+/sbin/ldconfig
 
 if [ "$1" = "2" ]; then
 	if [ ! -f "/etc/rc.d/init.d/%{OGO_INIT_NAME}" ]; then
@@ -887,12 +872,8 @@
 		chkconfig --del "%{OGO_INIT_NAME}"
 		rm -f "%{_sysconfdir}/rc.d/init.d/%{OGO_INIT_NAME}"
 	fi
-	##
-	if [ -e %{_sysconfdir}/ld.so.conf.d/ogo.conf ]; then
-		rm -f %{_sysconfdir}/ld.so.conf.d/ogo.conf
-	fi
-	/sbin/ldconfig
 fi
+/sbin/ldconfig
 
 %pre webui-app
 if [ "$1" = "2" ]; then
@@ -952,6 +933,7 @@
 
 %files
 %defattr(-,ogo,skyrix,-)
+%verify(not md5 mtime size) /etc/ld.so.conf.d/opengroupware.conf
 %dir %attr(700,ogo,skyrix) %{_var}/lib/opengroupware.org/.libFoundation
 %dir %attr(700,ogo,skyrix) %{_var}/lib/opengroupware.org/.libFoundation/Defaults
 %dir %attr(700,ogo,skyrix) %{_var}/lib/opengroupware.org/documents
@@ -1117,6 +1099,7 @@
 
 %files tools
 %defattr(-,root,root,-)
+%verify(not md5 mtime size) /etc/ld.so.conf.d/ogo.conf
 %{_bindir}/ogo-account-add
 %{_bindir}/ogo-account-del
 %{_bindir}/ogo-account-list
@@ -1339,6 +1322,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/10/20 13:41:31  glen
+- use ld.so.conf.d
+
 Revision 1.11  2005/09/13 23:55:11  wolvverine
 - -BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/opengroupware.spec?r1=1.11&r2=1.12&f=u