[Fedora-directory-commits] ldapserver Makefile, 1.29, 1.30 ldapserver.spec.tmpl, 1.22, 1.23 nsdefs.mk, 1.16, 1.17

[Doctor Conrad]

Author: rmeggins

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

Modified Files:
	Makefile ldapserver.spec.tmpl nsdefs.mk 
Log Message:
Change version to 1.0.2
RPM post install adds a new patch to fix the httpd module load order, removes
the console patch
Tell the user to run setup/setup after upgrade installation.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile	7 Dec 2005 21:25:50 -0000	1.29
+++ Makefile	23 Feb 2006 01:19:55 -0000	1.30
@@ -353,7 +353,7 @@
 	-e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \
 	-e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \
 	-e 's/@GEN-VERSION(a)/1.0/g' \
-	-e 's/@NOSP-VERSION(a)/1.0.1/g' \
+	-e 's/@NOSP-VERSION(a)/1.0.2/g' \
 	-e 's+@COMPANY-URL@+http://directory.fedora.redhat.com/+g' \
 	ldapserver.spec.tmpl > $@
 	mv $@ $(OBJDIR)


Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ldapserver.spec.tmpl	8 Dec 2005 04:14:27 -0000	1.22
+++ ldapserver.spec.tmpl	23 Feb 2006 01:19:55 -0000	1.23
@@ -122,18 +122,18 @@
 if [ -z "$RPM_INSTALL_PREFIX" ]; then
 	RPM_INSTALL_PREFIX=%{prefix}
 fi
-# patch file to fix startconsole ld libpath
-if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then
-    patch -d $RPM_INSTALL_PREFIX -p0 <
$RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch
-fi
 if [ "$1" -gt 1 ] ; then
 # patch file to upgrade admin server from 1.0 to 1.0.1
     if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then
-        patch -d $RPM_INSTALL_PREFIX -p0 <
$RPM_INSTALL_PREFIX/setup/adminserver10to101.patch
+        patch -s -f -d $RPM_INSTALL_PREFIX -p0 <
$RPM_INSTALL_PREFIX/setup/adminserver10to101.patch
     fi
 # patch file to fix start-admin on Fedora Core 2
     if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then
-        patch -d $RPM_INSTALL_PREFIX -p0 <
$RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch
+        patch -s -f -d $RPM_INSTALL_PREFIX -p0 <
$RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch
+    fi
+# patch file to fix module load order
+    if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch ] ; then
+        patch -s -f -d $RPM_INSTALL_PREFIX -p0 <
$RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch
     fi
 # fix up file permissions
     testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf
@@ -152,11 +152,12 @@
             chown $usergroup $RPM_INSTALL_PREFIX/alias
         fi
     fi
-    echo "Install finished.  Please restart your directory servers first,"
-    echo "then the admin server.  Do not run setup."
-else
-    echo "Install finished.  Please run $RPM_INSTALL_PREFIX/setup/setup to set up
the servers."
+    for instance in `ls -d $RPM_INSTALL_PREFIX/slapd-*`
+    do
+      cp $RPM_INSTALL_PREFIX/bin/slapd/install/schema/00core.ldif
$instance/config/schema
+    done
 fi
+echo "Install finished.  Please run $RPM_INSTALL_PREFIX/setup/setup to set up the
servers."
 
 %preun
 # only run uninstall if this is the last version of the package
@@ -169,6 +170,11 @@
 fi
 
 %changelog
+* Wed Feb 22 2006 Rich Megginson <rmeggins(a)redhat.com&gt; - 1.0.2-1
+- Remove startconsole patch; add patch to fix admin server httpd
+- module load order; you must now run setup after an upgrade; copy
+- in the new 00core.ldif schema file to the server instances
+
 * Tue Dec  6 2005 Rich Megginson <rmeggins(a)redhat.com&gt; - 1.0.1-1
 - Use nosp version instead of gen version to get patch version numbers
 - Patch the admin server in the post install section


Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nsdefs.mk	7 Dec 2005 21:25:50 -0000	1.16
+++ nsdefs.mk	23 Feb 2006 01:19:55 -0000	1.17
@@ -227,8 +227,8 @@
 OBJDIR=$(COMMON_OBJDIR)
 OBJDIR_32=$(COMMON_OBJDIR_32)
 DO_SEARCH=no
-DIR_VERSION:=1.0.1
-NOSP_DIR_VERSION:=1.0.1
+DIR_VERSION:=1.0.2
+NOSP_DIR_VERSION:=1.0.2
 DIR_NORM_VERSION:=1.0
 PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)"
 # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must