[Fedora-directory-commits] dsbuild/ds/ldapserver .cvsignore, NONE, 1.1 Makefile, 1.8, 1.9 checksums, 1.14, 1.15

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	Makefile checksums 
Added Files:
	.cvsignore 
Log Message:
updated for Fedora DS 1.1


--- NEW FILE .cvsignore ---
download
work
cookies


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile	6 Nov 2006 21:51:28 -0000	1.8
+++ Makefile	8 Feb 2008 21:51:57 -0000	1.9
@@ -1,103 +1,39 @@
 include ../../objdirname.mk
 
-GARNAME = fedora-ds
-GARVERSION = 1.0.4
+GARNAME = fedora-ds-base
+GARVERSION = 1.1.0
 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
-#MYPATCH = ldapserver-gcc4.patch
-PATCHFILES = ldap_cm_Makefile_104.patch
+PATCHFILES = 
 
 PKGDIR = $(ABS_GARDIR)/$(CATEGORIES)/ldapserver/work/pkg
 
 ifdef USE_CVS
 CVSMODULES = ldapserver
 else
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 endif
 
 LIBDEPS = 
 
-DESCRIPTION = ldapserver
+DESCRIPTION = Fedora Directory Server (base)
 
-#CONFIGURE_SCRIPTS = $(WORKSRC)/configure
-BUILD_SCRIPTS = $(WORKSRC)/Makefile
-#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.4 \
-	SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.3 \
-	DB_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/db/work/db-4.2.52.NC \
-	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
-
-ifdef SASL_SOURCE
-BUILD_ARGS += SASL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/cyrus-sasl/work/cyrus-sasl-2.1.20
-else
-BUILD_ARGS += SASL_SOURCE_ROOT=
-endif
-
-ifdef SNMP_SOURCE
-BUILD_ARGS += NETSNMP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/net-snmp/work/net-snmp-5.2.1
-else
-BUILD_ARGS += NETSNMP_SOURCE_ROOT=
-endif
+CONFIGURE_ARGS = $(DS_CONFIGURE_ARGS) --enable-bundle
 
-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
-endif # NOJAVA
-
-ifeq ($(DEBUG), optimize)
-BUILD_ARGS += BUILD_DEBUG=optimize
-endif
-ifndef DEBUG
-BUILD_ARGS += BUILD_DEBUG=optimize
-endif
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
 
 ifdef USE_CVS
 post-extract: extract-cvs
 endif
 
 # this is our "custom" patch target
-post-patch:
 ifdef MYPATCH
+post-patch:
 	cat $(addprefix download/,$(MYPATCH)) | ( cd work/$(GARNAME)-$(GARVERSION) ; patch -p1 )
-endif
 	$(MAKECOOKIE)
-
-configure-custom:
-	$(MAKECOOKIE)
-
-install-custom:
-ifdef BUILD_RPM
-	@echo The Fedora DS RPM should be in $(ABS_GARDIR)/$(CATEGORIES)/ldapserver/work
-	@echo After installing the RPM,
-	@echo cd /opt/fedora-ds \; ./setup/setup
-else
-	@echo ""
-	@echo Directory Server installation is a manual process during which you must provide
-	@echo information about your host, port, directory manager password, and more.  A setup
-	@echo program is provided.
-	@echo cd $(PKGDIR) \; ./setup
 endif
-	@echo You can find more information in the installation guide at:
-	@echo "http://directory.fedora.redhat.com/wiki/Setup"
-	@echo "AND"
-	@echo "http://directory.fedora.redhat.com/wiki/Install_Guide"
-	$(MAKECOOKIE)
 
-#include ../../gar.conf.mk
+include ../../gar.conf.mk
 
 include ../category.mk


Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- checksums	7 Nov 2006 04:28:24 -0000	1.14
+++ checksums	8 Feb 2008 21:51:57 -0000	1.15
@@ -1,2 +1 @@
-fca8c94d2bfdc3a762c0e8b09ab04b09  download/fedora-ds-1.0.4.tar.gz
-657d4f7cca9c3a4ea65012ae8203d395  download/ldap_cm_Makefile_104.patch
+a60d1ce51207e61c48b70aa85ae5e5a5  download/fedora-ds-base-1.1.0.tar.bz2