[Fedora-directory-commits] dsbuild/ds/ldapserver Makefile, 1.5, 1.6 checksums, 1.6, 1.7

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	Makefile checksums 
Log Message:
preliminary fds103 work


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	8 Apr 2006 19:26:57 -0000	1.5
+++ Makefile	11 Oct 2006 14:36:18 -0000	1.6
@@ -1,7 +1,7 @@
 include ../../objdirname.mk
 
 GARNAME = fedora-ds
-GARVERSION = 1.0.2
+GARVERSION = 1.0.3
 CATEGORIES = ds
 # have the regular download rule download the patch rather than listing it in PATCHFILES
 # this is so we can override the default patch rule
@@ -25,25 +25,28 @@
 #INSTALL_SCRIPTS = $(WORKSRC)/Makefile
 INSTALL_SCRIPTS = custom
 BUILD_ARGS = INSTDIR=$(PKGDIR) USE_PERL_FROM_PATH=1 BUILD_RPM=$(BUILD_RPM) \
+	USE_SETUPUTIL=1 USE_DSGW=1 USE_ORGCHART=1 USE_ADMINSERVER=1 \
+	USE_PERLDAP=1 \
 	MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \
 	MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \
 	ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \
-	ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \
-	SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \
+	ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.3 \
+	SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.3 \
 	SASL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/cyrus-sasl/work/cyrus-sasl-2.1.20 \
 	DB_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/db/work/db-4.2.52.NC \
 	NETSNMP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/net-snmp/work/net-snmp-5.2.1 \
-	ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.2 \
+	ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.3 \
 	ONLINEHELP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/dsonlinehelp/work/fedora-dsonlinehelp-1.0
 
 ifndef NOJAVA
 BUILD_ARGS += BUILD_JAVA_CODE=1 GET_JAVA_FROM_PATH=1 GET_ANT_FROM_PATH=1 \
+	USE_DSMLGW=1 USE_CONSOLE=1 USE_JAVATOOLS=1 \
 	LDAPCONSOLE_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/directoryconsole/work \
 	DSMLGWJARS_BUILD_DIR=$(ABS_GARDIR)/$(CATEGORIES)/dsmlgwjars/download \
 	LDAPJDK_DIR=$(ABS_GARDIR)/$(CATEGORIES)/ldapjdk/download \
 	CRIMSONJAR_BUILD_DIR=$(ABS_GARDIR)/$(CATEGORIES)/crimson/download
 else
-BUILD_ARGS += BUILD_JAVA_CODE=0 USE_DSMLGW= USE_CONSOLE= USE_JAVATOOLS=
+BUILD_ARGS += BUILD_JAVA_CODE=0
 endif # NOJAVA
 
 ifeq ($(DEBUG), optimize)


Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- checksums	1 Mar 2006 18:54:14 -0000	1.6
+++ checksums	11 Oct 2006 14:36:18 -0000	1.7
@@ -1 +1 @@
-d8bd5b68087229b4bb2e3867cb92ba85  download/fedora-ds-1.0.2.tar.gz
+cb739889e28ab1328ab33b3403cd6792  download/fedora-ds-1.0.3.tar.gz