[Fedora-directory-commits] ldapserver component_versions.mk, 1.41, 1.42 components.mk, 1.42, 1.43 internal_comp_deps.mk, 1.34, 1.35

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
	component_versions.mk components.mk internal_comp_deps.mk 
Log Message:
Fixing nightly build
Changes:
1) NSPR_RELDATE: v4.6.1 --> v4.6
2) ICU_LIB_VERSION: 34 --> 24
This is a temporary degrade to adjust the version to match the one in adminutil.Once adminutil is built with icu 3.4 and pushed to /s/b/c, we'd go back to 3.4.
3) lib/base/systhr.cpp: Applied NSPR sysfd table patch
4) DS version: 7.1 --> 7.2



Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- component_versions.mk	13 Feb 2006 22:25:27 -0000	1.41
+++ component_versions.mk	28 Feb 2006 03:00:08 -0000	1.42
@@ -52,7 +52,7 @@
 # naming scheme.
 # NSPR
 ifndef NSPR_RELDATE
-  NSPR_RELDATE = v4.6.1
+  NSPR_RELDATE = v4.6
 endif
 
 # SECURITY (NSS) LIBRARY
@@ -205,7 +205,7 @@
 
 # DOC
 ifndef DSDOC_RELDATE
-  DSDOC_RELDATE = 20051028
+  DSDOC_RELDATE = 20050311
 endif
 
 # WIX


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- components.mk	24 Feb 2006 22:52:10 -0000	1.42
+++ components.mk	28 Feb 2006 03:00:08 -0000	1.43
@@ -439,7 +439,7 @@
 
 ### ICU package ##########################################
 
-ICU_LIB_VERSION = 34
+ICU_LIB_VERSION = 24
 ifdef ICU_SOURCE_ROOT
   ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
   ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin
@@ -589,7 +589,7 @@
 # else set in internal_buildpaths.mk
 endif
 # these are the subcomponents we use from the adminserver package
-ADMINSERVER_SUBCOMPS=admin base setup.inf
+ADMINSERVER_SUBCOMPS=admin base
 
 ifdef LDAPCONSOLE_SOURCE_ROOT
   LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package


Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- internal_comp_deps.mk	10 Feb 2006 23:21:43 -0000	1.34
+++ internal_comp_deps.mk	28 Feb 2006 03:00:08 -0000	1.35
@@ -273,6 +273,7 @@
 
 ifndef ICU_SOURCE_ROOT
 ICU_RELEASE = $(COMPONENTS_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME)
+#ICU_RELEASE = $(COMPONENTS_DIR_DEV)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME)
 ICU_DEP = $(ICU_INCPATH)/unicode/ucol.h
 ifndef ICU_PULL_METHOD
 ICU_PULL_METHOD = $(COMPONENT_PULL_METHOD)
@@ -330,8 +331,8 @@
 ADMINUTIL_VERSION=$(ADMINUTIL_RELDATE)
 ADMINUTIL_BASE=$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION}
 ifeq ($(BUILD_MODE), int)
-  ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
-# ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+#  ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+  ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
 else
 #  ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
   ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
@@ -501,7 +502,7 @@
 ifndef GET_ANT_FROM_PATH
 #  (we use ant for building some Java code)
 ANTJAR = ant.jar
-JAXPJAR = jaxp.jar
+#JAXPJAR = jaxp.jar # ???
 ANT_FILES = $(ANTJAR) $(JAXPJAR)
 ANT_RELEASE = $(COMPONENTS_DIR)
 ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION)