[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.12, 1.13

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8712

Modified Files:
	ldapserver.spec.tmpl 
Log Message:
[172411] Use system SASL on RHEL
Added "cyrus-sasl >= 2.1.19" to the spec file:
   +Requires: perl,java-1.4.2-ibm,cyrus-sasl >= 2.1.19
Note: this diff contains the upgrade pre operaton to shutdown the servers before unpacking the files.



Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ldapserver.spec.tmpl	14 Sep 2005 21:39:42 -0000	1.12
+++ ldapserver.spec.tmpl	4 Nov 2005 20:03:01 -0000	1.13
@@ -58,7 +58,7 @@
 # Don't automatically generate provides list
 AutoProv: 0
 # Without Requires: something, rpmbuild will abort!
-Requires: perl,java-1.4.2-ibm
+Requires: perl,java-1.4.2-ibm,cyrus-sasl >= 2.1.19
 Prefix: /opt/%{name}
 
 %description
@@ -90,6 +90,32 @@
 # files in different places, we won't be able to do this anymore
 %defattr(-,root,root,-)
 %{prefix}
+# don't update admin server configuration files.
+# note: if there's somes change b/w 2 versions, on-disk file is put w/ .rpmsave
+%config %{prefix}/admin-serv/config/*
+
+%pre
+# in case upgrade, need to shutdown the servers before the installation
+ls $RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+  for instance in `ls -d $RPM_INSTALL_PREFIX/slapd-*`
+  do
+    if [ -f $instance/logs/pid ]; then
+      pid=`cat $instance/logs/pid`
+      psval=`ps -ef | egrep $pid`
+      if [ "$psval" != "" ]; then
+        $instance/stop-slapd
+      fi
+    fi
+  done
+fi
+if [ -f $RPM_INSTALL_PREFIX/admin-serv/logs/pid ]; then
+  pid=`cat $RPM_INSTALL_PREFIX/admin-serv/logs/pid`
+  psval=`ps -ef | egrep $pid`
+  if [ "$psval" != "" ]; then
+    $RPM_INSTALL_PREFIX/stop-admin
+  fi
+fi
 
 %post
 echo ""
@@ -109,6 +135,9 @@
 fi
 
 %changelog
+* Fri Nov 04 2005 Noriko Hosoi <nhosoi at redhat.com> 7.1-2
+- Added a dependency: cyrus-sasl >= 2.1.19
+
 * Wed Sep 14 2005 Nathan Kinder <nkinder at redhat.com> 7.1-2
 - Added a dependency on the java-1.4.2-ibm package