[Fedora-directory-commits] ldapserver/ldap/cm/newinst setup.patch, 1.1.2.6, 1.1.2.7 slapd-patch.inf, 1.1.2.2, 1.1.2.3

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/cm/newinst

Modified Files:
      Tag: Directory71RtmBranch
	setup.patch slapd-patch.inf 
Log Message:
[181582] Directory Server 7.1 SP2 packaging
Changes:
1) SP1 -> SP2
2) LDAPCSDK v5.16 -> v5.17
3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm ->
   redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm
4) modified makefile/script to support copying a component file


setup.patch:

Index: setup.patch
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup.patch,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- setup.patch	17 Nov 2005 23:29:42 -0000	1.1.2.6
+++ setup.patch	15 Feb 2006 21:32:32 -0000	1.1.2.7
@@ -73,8 +73,12 @@
 echo ""
 echo "To accept the default shown in brackets, press the Enter key."
 echo ""
-printf "Install location [/opt/fedora/servers]: "
+defaultserverroot=/opt/fedora-ds
+printf "Install location [$defaultserverroot]: "
 read serverroot
+if [ "$serverroot" = "" ]; then
+    serverroot=$defaultserverroot
+fi
 
 if [ ! -d $serverroot ]; then
     echo ""
@@ -243,10 +247,10 @@
 echo "ConfigDirectoryAdminID=   $adminid" >> $inffile
 echo "AdminDomain=   $admindomain" >> $inffile
 echo "ConfigDirectoryAdminPwd=   $siepasswd" >> $inffile
-echo "Components=   slapd-71sp1" >> $inffile
+echo "Components=   slapd-71sp2" >> $inffile
 echo "" >> $inffile
-echo "[slapd-71sp1]" >> $inffile
-echo "Components=   slapd-71sp1" >> $inffile
+echo "[slapd-71sp2]" >> $inffile
+echo "Components=   slapd-71sp2" >> $inffile
 
 clear
 


Index: slapd-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/slapd-patch.inf,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- slapd-patch.inf	16 Sep 2005 20:01:26 -0000	1.1.2.2
+++ slapd-patch.inf	15 Feb 2006 21:32:32 -0000	1.1.2.3
@@ -38,17 +38,17 @@
 #
 [General]
 Name= %%%SERVER_NAME%%%
-Components=slapd-71sp1
+Components=slapd-71sp2
 
-[slapd-71sp1]
+[slapd-71sp2]
 Name= %%%SERVER_NAME%%%
 InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%%
 Description= %%%SERVER_NAME%%%
-NickName= slapd-71sp1
+NickName= slapd-71sp2
 Version= %%%SERVER_VERSION%%%
 BuildNumber= %%%SERVER_BUILD_NUM%%%
-Archive= nsslapd-71sp1.zip
-SourcePath=slapd-71sp1
+Archive= nsslapd-71sp2.zip
+SourcePath=slapd-71sp2
 PreInstall= ns-config -r
 PostInstall= bin/slapd/admin/bin/ns-update
 PreUninstall= bin/slapd/admin/bin/uninstall