From 03462d65dcb2be5f8ccda2eb80353dce5e2d0d98 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Fri, 25 Mar 2005 02:09:27 +0000
Subject: [Bug 146919] Directory Server rebranding 1) Brandx -> Fedora 2) Pick
 up new internal component set (Admin SDK, Setup SDK, Admin Server) 3) Use JRE
 from the Admin Server package 4) Docs   a) Componentize Docs   b) Rebrand
 Docs   c) Drop packaging Administration Guide in the external version

---
 component_versions.mk | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'component_versions.mk')

diff --git a/component_versions.mk b/component_versions.mk
index 00e63902..87b5bae5 100644
--- a/component_versions.mk
+++ b/component_versions.mk
@@ -90,10 +90,10 @@ endif
 # admin server
 
 ifndef ADM_RELDATE
-  ADM_RELDATE = 20041117
+  ADM_RELDATE = 20050324
 endif
 ifndef ADM_VERSDIR
-  ADM_VERSDIR = admserv62
+  ADM_VERSDIR = adminserver/70$(BUILD_MODE)
 endif
 
 # peer
@@ -103,10 +103,14 @@ endif
 
 # setup sdk
 ifndef SETUP_SDK_RELDATE
-  SETUP_SDK_RELDATE = DS7.0
+  SETUP_SDK_RELDATE = 20050317
 endif
+ifndef SETUPSDK_VER
+  SETUPSDK_VER = 70
+endif
+
 ifndef SETUPSDK_VERSDIR
-  SETUPSDK_VERSDIR = v6.2
+  SETUPSDK_VERSDIR=setupsdk$(SETUPSDK_VER)$(BUILD_MODE)
 endif
 
 # infozip utilities
@@ -121,14 +125,14 @@ endif
 
 # admin utility library
 ifndef ADMINUTIL_VER
-  ADMINUTIL_VER=62
+  ADMINUTIL_VER=70
 endif
 ifndef ADMINUTIL_RELDATE
-  ADMINUTIL_RELDATE=20041117
+  ADMINUTIL_RELDATE=20050316
 endif
 
 ifndef ADMINUTIL_VERSDIR
-  ADMINUTIL_VERSDIR=adminsdk$(ADMINUTIL_VER)
+  ADMINUTIL_VERSDIR=adminsdk$(ADMINUTIL_VER)$(BUILD_MODE)
 endif
 
 # LDAP Console
@@ -185,3 +189,8 @@ endif
 ifndef ICU_RELDATE
   ICU_RELDATE=DS7.0
 endif
+
+# DOC
+ifndef DSDOC_RELDATE
+  DSDOC_RELDATE = 20050311
+endif
-- 
cgit