[Fedora-directory-commits] ldapserver component_versions.mk, 1.35.2.2, 1.35.2.3 components.mk, 1.30, 1.30.2.1 internal_comp_deps.mk, 1.24, 1.24.2.1 ldapserver.spec.tmpl, 1.10.2.7, 1.10.2.8 nsdefs.mk, 1.11.2.2, 1.11.2.3

[Doctor Conrad]

Author: nhosoi

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

Modified Files:
      Tag: Directory71RtmBranch
	component_versions.mk components.mk internal_comp_deps.mk 
	ldapserver.spec.tmpl nsdefs.mk 
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



Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -u -r1.35.2.2 -r1.35.2.3
--- component_versions.mk	22 Oct 2005 00:07:40 -0000	1.35.2.2
+++ component_versions.mk	15 Feb 2006 21:32:16 -0000	1.35.2.3
@@ -81,7 +81,7 @@
 
 # LDAP SDK
 ifndef LDAP_RELDATE
-  LDAP_RELDATE = v5.16
+  LDAP_RELDATE = v5.17
 endif
 ifndef LDAPCOMP_DIR
   LDAPCOMP_DIR=ldapsdk50


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -r1.30 -r1.30.2.1
--- components.mk	16 May 2005 21:58:00 -0000	1.30
+++ components.mk	15 Feb 2006 21:32:16 -0000	1.30.2.1
@@ -296,13 +296,15 @@
 else
   LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib
   LDAPSDK_INCDIR = $(LDAP_ROOT)/include
-  LDAPSDK_BINPATH = $(LDAP_ROOT)/tools
+  LDAPSDK_BINPATH = $(LDAP_ROOT)/bin
 endif
 LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR)
 
 # package the command line programs
-LDAPSDK_TOOLS = $(wildcard $(LDAPSDK_BINPATH)/ldap*$(EXE_SUFFIX))
-BINS_TO_PKG_SHARED += $(LDAPSDK_TOOLS)
+LDAPSDK_BINNAMES = ldapcmp ldapcompare ldapdelete ldapmodify ldapsearch
+LDAPSDK_TOOLS = $(addsuffix $(EXE_SUFFIX),$(LDAPSDK_BINNAMES))
+LDAPSDK_TOOLS_FULLPATH = $(addprefix $(LDAPSDK_BINPATH)/, $(LDAPSDK_TOOLS))
+BINS_TO_PKG_SHARED += $(LDAPSDK_TOOLS_FULLPATH)
 # package the include files - needed for the plugin API
 LDAPSDK_INCLUDE_FILES = $(wildcard $(LDAPSDK_INCDIR)/*.h)
 PACKAGE_SRC_DEST += $(subst
$(SPACE),$(SPACE)plugins/slapd/slapi/include$(SPACE),$(LDAPSDK_INCLUDE_FILES))


Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- internal_comp_deps.mk	18 May 2005 13:38:57 -0000	1.24
+++ internal_comp_deps.mk	15 Feb 2006 21:32:16 -0000	1.24.2.1
@@ -236,7 +236,7 @@
 	mkdir -p $(LDAP_LIBPATH)
 	$(FTP_PULL) -method $(LDAPSDK_PULL_METHOD) \
 		-objdir $(LDAP_ROOT) -componentdir $(LDAP_RELEASE) \
-		-files include,$(LDAPSDK_PULL_LIBS),tools
+		-files include,$(LDAPSDK_PULL_LIBS),bin
 endif
 	-@if [ ! -f $@ ] ; \
 	then echo "Error: could not get component LDAPSDK file $@" ; \


Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.10.2.7
retrieving revision 1.10.2.8
diff -u -r1.10.2.7 -r1.10.2.8
--- ldapserver.spec.tmpl	14 Oct 2005 17:32:46 -0000	1.10.2.7
+++ ldapserver.spec.tmpl	15 Feb 2006 21:32:16 -0000	1.10.2.8
@@ -45,7 +45,7 @@
 Summary: @COMPANY-PRODUCT-NAME@
 Name: @LCASE-COMPANY-NAME-NOSP@-ds
 Version: @GEN-VERSION@
-Release: 3.@PLATFORM@
+Release: 4.@PLATFORM@
 License: GPL plus extensions
 Group: System Environment/Daemons
 URL: @COMPANY-URL@


Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- nsdefs.mk	10 Sep 2005 00:41:45 -0000	1.11.2.2
+++ nsdefs.mk	15 Feb 2006 21:32:16 -0000	1.11.2.3
@@ -265,8 +265,8 @@
 OBJDIR=$(COMMON_OBJDIR)
 OBJDIR_32=$(COMMON_OBJDIR_32)
 DO_SEARCH=no
-DIR_VERSION:=7.1 SP1
-NOSP_DIR_VERSION:=7.1SP1
+DIR_VERSION:=7.1 SP2
+NOSP_DIR_VERSION:=7.1SP2
 DIR_NORM_VERSION:=7.1
 PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)"
 # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must