[Fedora-directory-commits] dsbuild/ds/adminserver .cvsignore, NONE, 1.1 Makefile, 1.9, 1.10 checksums, 1.11, 1.12

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

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/adminserver/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	6 Nov 2006 21:51:27 -0000	1.9
+++ Makefile	8 Feb 2008 21:51:51 -0000	1.10
@@ -1,55 +1,44 @@
 include ../../objdirname.mk
 
-GARNAME = fedora-adminserver
-GARVERSION = 1.0.3
+GARNAME = fedora-ds-admin
+GARVERSION = 1.1.1
 CATEGORIES = ds
 PATCHFILES = 
 
 ifdef USE_CVS
 CVSMODULES=adminserver
 else
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 endif
 
 LIBDEPS = 
 
-DESCRIPTION = adminserver
+DESCRIPTION = Fedora DS Admin Server
 
-#CONFIGURE_SCRIPTS = $(WORKSRC)/configure
-BUILD_SCRIPTS = $(WORKSRC)/Makefile
-#INSTALL_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = custom
-
-BUILD_ARGS = 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 \
-	ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0.3 \
-	MOD_ADMSERV_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0.3/.libs \
-	MOD_RESTARTD_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0.3/.libs \
-	MOD_NSS_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.5/.libs \
-	MOD_NSS_BINPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.5
-
-ifndef NOJAVA
-BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work \
-	ADMSERVCONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/admservconsole/work
-endif # NOJAVA
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+CONFIGURE_ARGS = $(DS_CONFIGURE_ARGS) --enable-bundle
+ifdef APR_CONFIG
+CONFIGURE_ARGS += --with-apr-config=$(APR_CONFIG)
+endif
+ifdef APXS
+CONFIGURE_ARGS += --with-apxs=$(APXS)
+CONFIGURE_ENV += CPPFLAGS="$(shell $(APXS) -q CPPFLAGS)"
+endif
+ifdef HTTPD
+CONFIGURE_ARGS += --with-httpd=$(HTTPD)
+endif
 
-ifneq ($(DEBUG), full)
-BUILD_ARGS += BUILD_DEBUG=optimize
+ifdef MOD_NSS_SOURCE
+CONFIGURE_ARGS += --with-modnss-lib=$(DESTDIR)$(PREFIX)/lib/dirsrv/modules --with-modnss-bin=$(DESTDIR)$(PREFIX)/sbin
 endif
 
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+
 ifdef USE_CVS
 post-extract: extract-cvs
 endif
 
-configure-custom:
-	$(MAKECOOKIE)
-
-install-custom:
-	$(MAKECOOKIE)
-
 include ../../gar.conf.mk
 
 include ../category.mk


Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminserver/checksums,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- checksums	16 Oct 2006 15:59:14 -0000	1.11
+++ checksums	8 Feb 2008 21:51:51 -0000	1.12
@@ -1 +1 @@
-c4c209e2c387a41d8519a52cbe9323a6  download/fedora-adminserver-1.0.3.tar.gz
+f50f2b6c983851c5e912047807bbcca6  download/fedora-ds-admin-1.1.1.tar.bz2