[Fedora-directory-commits] ldapserver nsdefs.mk, 1.11.2.1, 1.11.2.2 ldapserver.spec.tmpl, 1.10.2.2, 1.10.2.3

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
      Tag: Directory71RtmBranch
	nsdefs.mk ldapserver.spec.tmpl 
Log Message:
[167982] Service Pack framework
1) added patch info files and a perl script to process the info (RPM)
2) modified makefiles to create RPM based as well as setupsdk based SP package



Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- nsdefs.mk	31 Aug 2005 21:40:45 -0000	1.11.2.1
+++ nsdefs.mk	10 Sep 2005 00:41:45 -0000	1.11.2.2
@@ -238,7 +238,8 @@
  NSPR_DIR=nspr
 endif
 NSPR_BASENAME=libnspr21
-PRODUCT="Fedora Directory Server"
+PRODUCTCORE=Fedora Directory Server
+PRODUCT="$(PRODUCTCORE)"
 PRODUCT_IS_DIRECTORY_SERVER=1
 INSTANCE_NAME_PREFIX="Directory Server"
 DIR=slapd
@@ -267,6 +268,7 @@
 DIR_VERSION:=7.1 SP1
 NOSP_DIR_VERSION:=7.1SP1
 DIR_NORM_VERSION:=7.1
+PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)"
 # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must
 # update all of the .exp and .def files by executing the following command:
 #	cd ldap/libraries; gmake exportfiles


Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- ldapserver.spec.tmpl	7 Sep 2005 16:24:44 -0000	1.10.2.2
+++ ldapserver.spec.tmpl	10 Sep 2005 00:41:46 -0000	1.10.2.3
@@ -91,10 +91,44 @@
 %defattr(-,root,root,-)
 %{prefix}
 
+%pre
+# in case upgrade, need to shutdown the servers before the installation
+ls $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+  for instance in `ls -d $RPM_BUILD_ROOT/$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_BUILD_ROOT/$RPM_INSTALL_PREFIX/admin-serv/logs/pid ]; then
+  pid=`cat $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/admin-serv/logs/pid`
+  psval=`ps -ef | egrep $pid`
+  if [ "$psval" != "" ]; then
+    $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/stop-admin
+  fi
+fi
+
 %post
+# in case upgrade, need to start the servers before running setup
+ls $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+  for instance in `ls -d $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-*`
+  do
+    $instance/start-slapd
+  done
+fi
+if [ -f $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/start-admin ]; then
+  $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/start-admin
+fi
 echo ""
 if [ -z "$RPM_INSTALL_PREFIX" ]; then
-	RPM_INSTALL_PREFIX=%{prefix}
+    RPM_INSTALL_PREFIX=%{prefix}
 fi
 echo "Install finished.  Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers."