[Fedora-directory-commits] adminserver/admserv/newinst/src admin.inf.in, 1.2, 1.3 adminserver.map.in, 1.1, 1.2 configdsroot.map.in, 1.1, 1.2 dirserver.map.in, 1.1, 1.2 register_param.map.in, 1.1, 1.2 setup.inf.in, 1.1, 1.2
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Thu Jun 21 22:01:54 UTC 2007
- Previous message (by thread): [Fedora-directory-commits] adminserver Makefile.am, 1.13, 1.14 configure.ac, 1.9, 1.10 Makefile.in, 1.13, 1.14 aclocal.m4, 1.10, 1.11 configure, 1.12, 1.13
- Next message (by thread): [Fedora-directory-commits] adminserver/admserv/schema/ldif 01nsroot.ldif.tmpl, 1.3, 1.4 02globalpreferences.ldif.tmpl, 1.2, 1.3 10dsdata.ldif.tmpl, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27625/admserv/newinst/src
Modified Files:
admin.inf.in adminserver.map.in configdsroot.map.in
dirserver.map.in register_param.map.in setup.inf.in
Log Message:
Resolves: #244749
Summary: Configure Pass Thru Auth (comment #8, #9)
Description: 1) Introducing BaseVersion (*.inf files) via PACKAGE_BASE_VERSION
(configure.ac) to generate #.# format version number from #.#.#. The #.#
format version number is used in the jar file names
2) configure.ac: Changed the default prefix to the hardcoded string: AC_PREFIX_DEFAULT([/opt/fedora-ds])
Index: admin.inf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/admin.inf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- admin.inf.in 15 Jun 2007 22:16:28 -0000 1.2
+++ admin.inf.in 21 Jun 2007 22:01:51 -0000 1.3
@@ -29,6 +29,7 @@
NormBrand = @brand@
Vendor=@vendor@
Version= @PACKAGE_VERSION@
+BaseVersion= @PACKAGE_BASE_VERSION@
NickName= admin
BuildNumber= @NQBUILD_NUM@
# the rest of these are obsolete, but left here for
Index: adminserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adminserver.map.in 19 Jun 2007 18:32:28 -0000 1.1
+++ adminserver.map.in 21 Jun 2007 22:01:51 -0000 1.2
@@ -66,10 +66,11 @@
as_error = "@logdir@/errors"
as_access = "@logdir@/access"
as_pid = "@pidfile@"
-as_console_jar = "%normbrand%-admserv-%as_version%.jar"
+as_console_jar = "%normbrand%-admserv-%as_baseversion%.jar"
as_help_path = "@helpdir@"
as_user = SysUser
as_version = Version
+as_baseversion = BaseVersion
as_buildnum = BuildNumber
as_installedlocation = "AS INSTALLED LOCATION -- replace me"
as_serverroot = "AS SERVER ROOT-- replace me"
Index: configdsroot.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/configdsroot.map.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configdsroot.map.in 15 Jun 2007 22:16:28 -0000 1.1
+++ configdsroot.map.in 21 Jun 2007 22:01:51 -0000 1.2
@@ -62,10 +62,12 @@
as_passwd = ServerAdminPwd
asid = `use Net::Domain qw(hostname); $returnvalue = hostname();`
as_version = Version
+as_baseversion = BaseVersion
ds_version = Version
+ds_baseversion = BaseVersion
ds_port = ServerPort
ds_secure_port ="636"
ds_suffix = Suffix
-ds_console_jar ="%normbrand%-ds-%ds_version%.jar"
+ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
Index: dirserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dirserver.map.in 19 Jun 2007 18:32:28 -0000 1.1
+++ dirserver.map.in 21 Jun 2007 22:01:51 -0000 1.2
@@ -63,6 +63,7 @@
asid = `use Net::Domain qw(hostname); $returnvalue = hostname();`
as_sie = "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
ds_version = Version
+ds_baseversion = BaseVersion
dsid = ServerIdentifier
ds_user = SuiteSpotUserID
ds_port = ServerPort
@@ -70,7 +71,7 @@
rootdn = RootDN
ds_suffix = Suffix
ds_buildnum = BuildNumber
-ds_console_jar ="%normbrand%-ds-%ds_version%.jar"
+ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
ds_installedlocation = "DS INSTALLED LOCATION -- replace me"
ds_serverroot = "DS SERVER ROOT-- replace me"
ds_sie = "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
Index: register_param.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- register_param.map.in 13 Jun 2007 17:48:35 -0000 1.1
+++ register_param.map.in 21 Jun 2007 22:01:51 -0000 1.2
@@ -71,16 +71,18 @@
as_error = "@logdir@/errors"
as_access = "@logdir@/access"
as_pid = "@pidfile@"
-as_console_jar = "%normbrand%-admserv-%as_version%.jar"
+as_console_jar = "%normbrand%-admserv-%as_baseversion%.jar"
as_help_path = "@helpdir@"
as_user = SysUser
as_version = Version
+as_baseversion = BaseVersion
as_buildnum = BuildNumber
as_installedlocation = "AS INSTALLED LOCATION -- replace me"
as_serverroot = "AS SERVER ROOT-- replace me"
as_sie = "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
ds_version = Version
+ds_baseversion = BaseVersion
dsid = ServerIdentifier
ds_user = SuiteSpotUserID
ds_port = ServerPort
@@ -89,7 +91,7 @@
ds_suffix = Suffix
ds_buildnum = BuildNumber
ds_passwd = RootDNPwd
-ds_console_jar ="%normbrand%-ds-%ds_version%.jar"
+ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
ds_installedlocation = "DS INSTALLED LOCATION -- replace me"
ds_serverroot = "DS SERVER ROOT-- replace me"
ds_sie = "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
Index: setup.inf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup.inf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setup.inf.in 20 Jun 2007 22:33:19 -0000 1.1
+++ setup.inf.in 21 Jun 2007 22:01:51 -0000 1.2
@@ -31,5 +31,6 @@
Vendor = @capbrand@ Project
Description = @capbrand@ Server Products Installation
Version = @PACKAGE_VERSION@
-Brand = @capbrand@
-NormBrand = @brand@
+BaseVersion = @PACKAGE_BASE_VERSION@
+Brand = @capbrand@
+NormBrand = @brand@
- Previous message (by thread): [Fedora-directory-commits] adminserver Makefile.am, 1.13, 1.14 configure.ac, 1.9, 1.10 Makefile.in, 1.13, 1.14 aclocal.m4, 1.10, 1.11 configure, 1.12, 1.13
- Next message (by thread): [Fedora-directory-commits] adminserver/admserv/schema/ldif 01nsroot.ldif.tmpl, 1.3, 1.4 02globalpreferences.ldif.tmpl, 1.2, 1.3 10dsdata.ldif.tmpl, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list