[Fedora-directory-commits] directoryconsole/help/en footer.html, NONE, 1.1 header.html, NONE, 1.1 tokens.map, NONE, 1.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/directoryconsole/help/en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29173/help/en
Added Files:
footer.html header.html tokens.map
Log Message:
Resolves: 252036
Summary: Added online help files to fedora-ds-console package.
--- NEW FILE footer.html ---
</blockquote>
<br />
<hr noshade="noshade" size="1" />
<!-- BEGIN COPYRIGHT BLOCK -->
<p class="copy">
Copyright (C) Sun Microsystems, Inc. Used by permission.<br>
Copyright (C) 2007 Red Hat, Inc. All rights reserved.
</p>
<p class="copy">
This material may be distributed only subject to the terms and conditions set
forth in the Open Publication License, V1.0 or later (the latest version is
presently available at http://www.opencontent.org/openpub/).
</p>
<p class="copy">
Distribution of substantively modified versions of this document is prohibited
without the explicit permission of the copyright holder.
</p>
<p class="copy">
Distribution of the work or derivative of the work in any standard (paper)
book form for commercial purposes is prohibited unless prior permission
is obtained from the copyright holder.
</p>
<!-- END COPYRIGHT BLOCK -->
<br />
</body>
</html>
--- NEW FILE header.html ---
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
<title>Fedora Management Console and Directory Server Help</title>
<style type="text/css">
*.booktitle {font-size: 20px; font-weight: bold;}
*.caution{;}
*.code {;}
*.copy {font-size: 10px;}
*.topic {font-size: 18px; font-weight: bold;}
*.h2 {font-weight: bold;}
*.text {font-size: 14px;}
</style>
</head>
<body>
<span class="booktitle">Fedora Management Console and Directory Server Help</span>
<hr size="1" noshade="noshade" />
<br />
<blockquote>
--- NEW FILE tokens.map ---
; --- BEGIN COPYRIGHT BLOCK ---
; This Program is free software; you can redistribute it and/or modify it under
; the terms of the GNU General Public License as published by the Free Software
; Foundation; version 2 of the License.
;
; This Program is distributed in the hope that it will be useful, but WITHOUT
; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
; FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
;
; You should have received a copy of the GNU General Public License along with
; this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
; Place, Suite 330, Boston, MA 02111-1307 USA.
;
; In addition, as a special exception, Red Hat, Inc. gives You the additional
; right to link the code of this Program with code not covered under the GNU
; General Public License ("Non-GPL Code") and to distribute linked combinations
; including the two, subject to the limitations in this paragraph. Non-GPL Code
; permitted under this exception must only link to the code of this Program
; through those well defined interfaces identified in the file named EXCEPTION
; found in the source code files (the "Approved Interfaces"). The files of
; Non-GPL Code may instantiate templates or use macros or inline functions from
; the Approved Interfaces without causing the resulting work to be covered by
; the GNU General Public License. Only Red Hat, Inc. may make changes or
; additions to the list of Approved Interfaces. You must obey the GNU General
; Public License in all respects for all of the Program code and other code used
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
; provide this exception without modification, you must delete this exception
; statement from your version and license this file solely under the GPL without
; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
; Copyright (C) 2007 Red Hat, Inc.
; All rights reserved.
; --- END COPYRIGHT BLOCK ---
;-------------------------------------------MAPPINGS
; UI Reference Token = help/filename.html
;-------------------------------------------PROGRAMS
;
;MENU BAR
;
;Help Menu from all tabs
framework-menubar-contents = help/redir_agtoc.html
preferences-confirmation-help = help/helpmenu.html
framework-menubar-dochome = help/redir_dochome.html
;TASKS TAB
tasks-backup-help = help/taskstab_bkup_restore.html
tasks-restore-help = help/taskstab_bkup_restore2.html
;CONFIGURATION TAB
;Root Node
configuration-system-settings-help = help/configtab_rootnode.html
configuration-system-performance-help = help/configtab_rootnode2.html
configuration-system-encryption-help = help/configtab_rootnode3.html
configuration-system-snmp-help = help/configtab_rootnode5.html
configuration-system-manager-help = help/configtab_rootnode6.html
configuration-system-sasl-help = help/configtab_rootnode7.html
configuration-system-sasl-add-dbox-help = help/configtab_rootnode8.html
configuration-system-sasl-mod-dbox-help = help/configtab_rootnode9.html
;Database Icon
configuration-database-indexes-help = help/configtab_db.html
configuration-database-passwords-help = help/configtab_db2.html
configuration-database-accountlockout-help = help/configtab_db3.html
configuration-database-indexes-add-dbox-help = help/configtab_db4.html
configuration-database-settings-help = help/configtab_db5.html
configuration-database-import-ldap-dbox-help = help/configtab_db6.html
configuration-database-import-fastwire-dbox-help = help/configtab_db7.html
configuration-database-initialize-backend-dbox-help = help/configtab_db8.html
configuration-database-export-dbox-help = help/configtab_db9.html
configuration-database-export-single-dbox-help = help/configtab_db10.html
configuration-database-plugin-setting-help = help/configtab_db11.html
configuration-database-default-indexes-help = help/configtab_db12.html
configuration-database-attrenc-help = help/configtab_db13.html
configuration-database-attrenc-add-dbox-help = help/configtab_db14.html
configuration-database-attrenc-method-select-dbox-help = help/configtab_db15.html
;Chaining Database Icon
configuration-new-chaining-instance-dbox-help = help/configtab_chaindb.html
configuration-chaining-settings-help = help/configtab_chaindb2.html
configuration-chaining-settings-ctrl-chooser-dbox-help = help/configtab_chaindb3.html
configuration-chaining-settings-comp-chooser-dbox-help = help/configtab_chaindb4.html
configuration-chaining-default-help = help/configtab_chaindb5.html
configuration-chaining-connection-help = help/configtab_chaindb6.html
configuration-chaining-authentication-help = help/configtab_chaindb7.html
;LDBM Database Instance Icon
configuration-new-ldbm-instance-dbox-help = help/configtab_ldbmdb.html
;Mapping Tree/Suffix
configuration-mapping-setting-help = help/configtab_maptree.html
configuration-mapping-add-backend-dbox-help = help/configtab_maptree2.html
configuration-mapping-database-help = help/configtab_maptree3.html
configuration-mapping-referral-help = help/configtab_maptree4.html
configuration-new-mapping-node-dbox-help = help/configtab_maptree5.html
configuration-new-mapping-sub-suffix-dbox-help = help/configtab_maptree6.html
configuration-confirm-delete-suffix-dbox-help = help/configtab_maptree7.html
;Schema Icon
configuration-schema-objclass-help = help/configtab_schema.html
configuration-schema-objclass-create-dbox-help = help/configtab_schema2.html
configuration-schema-attr-help = help/configtab_schema3.html
configuration-schema-attr-create-dbox-help = help/configtab_schema4.html
configuration-schema-mrule-help = help/configtab_schema5.html
;Replication Agreements Icon
configuration-replication-legacyconsumersettings-help = help/configtab_replication.html
configuration-replication-suppliersettings-help = help/configtab_replication2.html
configuration-replication-replicasettings-help = help/configtab_replication3.html
configuration-replication-summary-help = help/configtab_replication4.html
configuration-replication-schedule-help = help/configtab_replication5.html
configuration-replication-content-help = help/configtab_replication6.html
configuration-replication-host-dbox-help = help/configtab_replication7.html
configuration-replication-export-help = help/configtab_replication8.html
;Logs Icon
configuration-logs-access-help = help/configtab_logs.html
configuration-logs-error-help = help/configtab_logs2.html
configuration-logs-audit-help = help/configtab_logs3.html
;Plugins Icons
configuration-plugins-help = help/configtab_plugins.html
;REPLICATION AGREEMENT WIZARD
replication-wizard-content-help = help/replication_wizard.html
replication-wizard-schedule-help = help/replication_wizard2.html
replication-wizard-consumerinit-help = help/replication_wizard3.html
replication-wizard-summary-help = help/replication_wizard4.html
replication-wizard-legacyrmmrname-help = help/replication_wizard5.html
replication-wizard-attribute-help = help/replication_wizard6.html
;replication-wizard-cirsirselect-help = help/replication_wizard6.html
;replication-wizard-cirsirname-help = help/replication_wizard7.html
;WINDOWS SYNC AGREEMENT WIZARD
sync-wizard-agreement-help = help/synchronization_wizard1.html
sync-wizard-content-help = help/synchronization_wizard2.html
; Repl and Sync share the summary page.
;sync-wizard-summary-help = help/synchronization_wizard3.html
;WINDOWS SYNC CONFIG TABS
configuration-sync-summary-help = help/configtab_synchronization1.html
configuration-sync-schedule-help = help/configtab_synchronization2.html
configuration-sync-connection-help = help/configtab_synchronization3.html
;DIRECTORY TAB
;Role Configuration
configuration-role-member-filtered-help = help/dirtab_role.html
configuration-role-member-managed-help = help/dirtab_role2.html
configuration-role-member-nested-help = help/dirtab_role3.html
configuration-role-account-help = help/dirtab_role4.html
configuration-role-info-help = help/dirtab_role5.html
configuration-set-role = help/dirtab_role6.html
configuration-choose-role = help/dirtab_role7.html
;Fine-Grained Password Policy Configuration
configuration-browser-passwords-help = help/dir_browser2.html
configuration-browser-accountlockout-help = help/dir_browser3.html
configuration-set-referral = help/dir_browser4.html
;CoS Configuration
configuration-cos-attributes-help = help/dirtab_cos.html
configuration-cos-info-help = help/dirtab_cos2.html
configuration-cos-template-help = help/dirtab_cos3.html
;STATUS TAB
;Replication Icon
status-replication-help = help/statustab_replication.html
;Logs Icon
status-logs-access-help = help/statustab_logs.html
status-logs-error-help = help/statustab_logs2.html
status-logs-audit-help = help/statustab_logs3.html
;Performance Counters Icon
status-perfcounters-server-help = help/statustab_performance.html
status-perfcounters-database-help = help/statustab_performance2.html
;General Server Status
status-server-general-help = help/statustab_general.html
;PROPERTY EDITOR WINDOWS
property-main-help = help/property_editor.html
property-new-objectclass-dbox-help = help/property_editor2.html
property-new-attribute-dbox-help = help/property_editor3.html
property-main-create-help = help/property_editor4.html
;LDAP URL Construction Dialog
configuration-construct-new-url-dbox-help = help/ldap_url.html
;Account Management Dialog
configuration-user-account-help = help/account_mgmt.html
;VERY ADVANCED SEARCH DIALOG BOX
search-dbox-veryadvanced-help = help/adv_search.html
;INSTALL
menubar-newinstance-dbox-help = help/new_instance.html
; SUBTREE SELECTION DIALOG BOX
subtree-selection-dbox-help = help/dir_browser.html
16 years, 8 months
[Fedora-directory-commits] directoryconsole fedora-ds-console.spec, 1.3, 1.4
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29173
Modified Files:
fedora-ds-console.spec
Log Message:
Resolves: 252036
Summary: Added online help files to fedora-ds-console package.
Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-console.spec 2 Aug 2007 16:59:52 -0000 1.3
+++ fedora-ds-console.spec 13 Aug 2007 22:28:08 -0000 1.4
@@ -2,10 +2,11 @@
%define minor_version 0
%define shortname fedora-ds
+%define pkgname dirsrv
Name: fedora-ds-console
Version: %{major_version}.%{minor_version}
-Release: 3
+Release: 4
Summary: Fedora Directory Server Management Console
Group: Applications
@@ -34,11 +35,15 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
-install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
+install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java
+install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java
+install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/slapd/help
+install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/slapd
+install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/slapd
+install -m644 help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/slapd/help
# create symlinks
-pushd $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
+pushd $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java
ln -s %{shortname}-%{version}.jar %{shortname}-%{major_version}.jar
ln -s %{shortname}-%{version}.jar %{shortname}.jar
ln -s %{shortname}-%{version}_en.jar %{shortname}-%{major_version}_en.jar
@@ -50,14 +55,22 @@
%files
%defattr(-,root,root)
-%{_datadir}/%{shortname}/html/java/%{shortname}-%{version}.jar
-%{_datadir}/%{shortname}/html/java/%{shortname}-%{major_version}.jar
-%{_datadir}/%{shortname}/html/java/%{shortname}.jar
-%{_datadir}/%{shortname}/html/java/%{shortname}-%{version}_en.jar
-%{_datadir}/%{shortname}/html/java/%{shortname}-%{major_version}_en.jar
-%{_datadir}/%{shortname}/html/java/%{shortname}_en.jar
+%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}.jar
+%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}.jar
+%{_datadir}/%{pkgname}/html/java/%{shortname}.jar
+%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}_en.jar
+%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}_en.jar
+%{_datadir}/%{pkgname}/html/java/%{shortname}_en.jar
+%dir %{_datadir}/%{pkgname}/manual/en/slapd
+%{_datadir}/%{pkgname}/manual/en/slapd/tokens.map
+%doc %{_datadir}/%{pkgname}/manual/en/slapd/*.html
+%doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
%changelog
+* Mon Aug 13 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-4
+- Added online help files to package. Use pkgname for filesystem
+ path naming instead of shortname.
+
* Wed Aug 1 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-3
- Updated build requirement for new console framework package.
Updated install location and Admin Server dependency. Also did
16 years, 8 months
[Fedora-directory-commits] adminserver configure.ac, 1.17, 1.18 aclocal.m4, 1.27, 1.28 configure, 1.30, 1.31 missing, 1.18, 1.19 install-sh, 1.18, 1.19 depcomp, 1.18, 1.19 config.sub, 1.18, 1.19 config.guess, 1.18, 1.19 compile, 1.17, 1.18 Makefile.in, 1.33, 1.34
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4733/adminserver
Modified Files:
configure.ac aclocal.m4 configure missing install-sh depcomp
config.sub config.guess compile Makefile.in
Log Message:
Resolves: bug 251549
Bug Description: Change filesystem path naming from "fedora-ds" to "dirsrv"
Reviewed by: nkinder (Thanks!)
Fix Description: Mostly just changing the package name in configure.ac, and making sure we consistently use that in path naming (e.g. /etc/@PACKAGE_NAME@ or /etc/@PACKAGE_NAME_BASE@ for adminserver).
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Oh yes.
QA impact: Any existing tests that depend on /path/brand-ds will need to change to use dirsrv. It is highly encouraged to use a macro or variable for the package name in any scripts to minimize the impact of future package name changes.
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure.ac 2 Aug 2007 14:58:34 -0000 1.17
+++ configure.ac 13 Aug 2007 15:40:47 -0000 1.18
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([fedora-ds-admin], [1.1.0], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv-admin], [1.1.0], [http://bugzilla.redhat.com/])
AC_CONFIG_SRCDIR([admserv/cgi-src40/viewlog.c])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
@@ -59,7 +59,8 @@
PACKAGE_BASE_NAME=`echo $PACKAGE_NAME | sed -e s/-admin//`
AC_SUBST(PACKAGE_BASE_NAME)
# the default prefix - override with --prefix or --with-fhs or --with-fhs-opt
-AC_PREFIX_DEFAULT([/opt/fedora-ds])
+# unfortunately, this must be a literal - it should be $PACKAGE_BASE_NAME
+AC_PREFIX_DEFAULT([/opt/dirsrv])
PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print $1"."$2}'`
AC_SUBST(PACKAGE_BASE_VERSION)
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- configure 6 Aug 2007 19:54:25 -0000 1.30
+++ configure 13 Aug 2007 15:40:47 -0000 1.31
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fedora-ds-admin 1.1.0.
+# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.0.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -421,10 +421,10 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME='fedora-ds-admin'
-PACKAGE_TARNAME='fedora-ds-admin'
+PACKAGE_NAME='dirsrv-admin'
+PACKAGE_TARNAME='dirsrv-admin'
PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='fedora-ds-admin 1.1.0'
+PACKAGE_STRING='dirsrv-admin 1.1.0'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
ac_unique_file="admserv/cgi-src40/viewlog.c"
@@ -465,7 +465,7 @@
# include <unistd.h>
#endif"
-ac_default_prefix=/opt/fedora-ds
+ac_default_prefix=/opt/dirsrv
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
@@ -957,7 +957,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures fedora-ds-admin 1.1.0 to adapt to many kinds of systems.
+\`configure' configures dirsrv-admin 1.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1023,7 +1023,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fedora-ds-admin 1.1.0:";;
+ short | recursive ) echo "Configuration of dirsrv-admin 1.1.0:";;
esac
cat <<\_ACEOF
@@ -1200,7 +1200,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-fedora-ds-admin configure 1.1.0
+dirsrv-admin configure 1.1.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1214,7 +1214,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fedora-ds-admin $as_me 1.1.0, which was
+It was created by dirsrv-admin $as_me 1.1.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1857,7 +1857,7 @@
# Define the identity of the package.
- PACKAGE='fedora-ds-admin'
+ PACKAGE='dirsrv-admin'
VERSION='1.1.0'
@@ -23014,6 +23014,7 @@
PACKAGE_BASE_NAME=`echo $PACKAGE_NAME | sed -e s/-admin//`
# the default prefix - override with --prefix or --with-fhs or --with-fhs-opt
+# unfortunately, this must be a literal - it should be $PACKAGE_BASE_NAME
PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print $1"."$2}'`
@@ -25697,7 +25698,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by fedora-ds-admin $as_me 1.1.0, which was
+This file was extended by dirsrv-admin $as_me 1.1.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25760,7 +25761,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-fedora-ds-admin config.status 1.1.0
+dirsrv-admin config.status 1.1.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
16 years, 8 months
[Fedora-directory-commits] ldapserver/wrappers initscript.in, 1.5, 1.6
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4386/ldapserver/wrappers
Modified Files:
initscript.in
Log Message:
Resolves: bug 251549
Bug Description: Change filesystem path naming from "fedora-ds" to "dirsrv"
Reviewed by: nkinder (Thanks!)
Fix Description: Mostly just changing the package name in configure.ac, and making sure we consistently use that in path naming (e.g. /etc/@PACKAGE_NAME@ or /etc/@PACKAGE_NAME_BASE@ for adminserver).
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Oh yes.
QA impact: Any existing tests that depend on /path/brand-ds will need to change to use dirsrv. It is highly encouraged to use a macro or variable for the package name in any scripts to minimize the impact of future package name changes.
Index: initscript.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/initscript.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- initscript.in 16 Mar 2007 23:06:58 -0000 1.5
+++ initscript.in 13 Aug 2007 15:35:36 -0000 1.6
@@ -3,7 +3,7 @@
# @package_name@ This starts and stops @package_name@
#
# chkconfig: - 21 79
-# description: @package_name@ Directory Server
+# description: @capbrand@ Directory Server
# processname: @sbindir@/ns-slapd
# configdir: @sysconfdir@/@package_name@/
# piddir: @localstatedir@/run/@package_name@
16 years, 8 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools dbscan.c, 1.15, 1.16
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4386/ldapserver/ldap/servers/slapd/tools
Modified Files:
dbscan.c
Log Message:
Resolves: bug 251549
Bug Description: Change filesystem path naming from "fedora-ds" to "dirsrv"
Reviewed by: nkinder (Thanks!)
Fix Description: Mostly just changing the package name in configure.ac, and making sure we consistently use that in path naming (e.g. /etc/@PACKAGE_NAME@ or /etc/@PACKAGE_NAME_BASE@ for adminserver).
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Oh yes.
QA impact: Any existing tests that depend on /path/brand-ds will need to change to use dirsrv. It is highly encouraged to use a macro or variable for the package name in any scripts to minimize the impact of future package name changes.
Index: dbscan.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/dbscan.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dbscan.c 10 Nov 2006 23:45:51 -0000 1.15
+++ dbscan.c 13 Aug 2007 15:35:35 -0000 1.16
@@ -750,7 +750,7 @@
printf(" -r display the conents of idl\n");
printf(" -s Summary of index counts\n");
printf(" sample usages:\n");
- printf(" # set <prefix>/usr/lib/<brand-ds>:<prefix>/usr/lib:/usr/lib in the library path\n");
+ printf(" # set <prefix>/usr/lib/<PACKAGE_NAME>:<prefix>/usr/lib:/usr/lib in the library path\n");
printf(" # dump the entry file\n");
printf(" %s -f id2entry.db\n", argv0);
printf(" # display index keys in cn.db4\n");
16 years, 8 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins README, 1.8, 1.9 sampletask.c, 1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4386/ldapserver/ldap/servers/slapd/test-plugins
Modified Files:
README sampletask.c
Log Message:
Resolves: bug 251549
Bug Description: Change filesystem path naming from "fedora-ds" to "dirsrv"
Reviewed by: nkinder (Thanks!)
Fix Description: Mostly just changing the package name in configure.ac, and making sure we consistently use that in path naming (e.g. /etc/@PACKAGE_NAME@ or /etc/@PACKAGE_NAME_BASE@ for adminserver).
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Oh yes.
QA impact: Any existing tests that depend on /path/brand-ds will need to change to use dirsrv. It is highly encouraged to use a macro or variable for the package name in any scripts to minimize the impact of future package name changes.
Index: README
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- README 15 Dec 2006 00:22:54 -0000 1.8
+++ README 13 Aug 2007 15:35:35 -0000 1.9
@@ -188,7 +188,7 @@
1. Stop the server.
Console: Select the server; Object > Stop Server
- Command Line: cd [prefix]/usr/lib/<brand>-ds/slapd-[serverID] ; ./stop-slapd
+ Command Line: cd [prefix]/usr/lib/<PACKAGE_NAME>/slapd-[serverID] ; ./stop-slapd
2. Add the entry for the server plug-in to
[prefix]/var/lib/slapd-[serverID]/dse.ldif. For example:
@@ -198,7 +198,7 @@
objectClass: nsSlapdPlugin
objectClass: extensibleObject
cn: [My Server Plugin]
- nsslapd-pluginPath: [[prefix]/usr/lib/<brand>-ds/plugins/myveryown-plugin.so]
+ nsslapd-pluginPath: [[prefix]/usr/lib/<PACAKGE_NAME>/plugins/myveryown-plugin.so]
nsslapd-pluginInitfunc: [my_plugin_init]
nsslapd-pluginType: [myPluginType]
nsslapd-pluginEnabled: on
@@ -217,4 +217,4 @@
3. Restart the server.
Console: Object > Start Server
- Command Line: cd [prefix]/usr/lib/<brand>-ds/slapd-[serverID] ; ./restart-slapd
+ Command Line: cd [prefix]/usr/lib/<PACKAGE_NAME>/slapd-[serverID] ; ./restart-slapd
Index: sampletask.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/sampletask.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sampletask.c 15 Dec 2006 00:22:54 -0000 1.1
+++ sampletask.c 13 Aug 2007 15:35:35 -0000 1.2
@@ -39,7 +39,7 @@
*
* [How to set up the plugin for testing]
* 1. compile and package with the other plugins
- * 2. put the plugin libsampletask-plugin.so at <prefix>/usr/lib/<brand>-ds/plugins
+ * 2. put the plugin libsampletask-plugin.so at <prefix>/usr/lib/<PACKAGE_NAME>/plugins
* 3. register it as a plugin in dse.ldif
* Plugin entry:
* dn: cn=sampletask,cn=plugins,cn=config
@@ -47,7 +47,7 @@
* objectClass: nsSlapdPlugin
* objectClass: extensibleObject
* cn: sampletask
- * nsslapd-pluginPath: <prefix>/usr/lib/<brand>-ds/plugins/libsampletask-plugin.so
+ * nsslapd-pluginPath: <prefix>/usr/lib/<PACKAGE_NAME>/plugins/libsampletask-plugin.so
* nsslapd-pluginInitfunc: sampletask_init
* nsslapd-pluginType: object
* nsslapd-pluginEnabled: on
16 years, 8 months
[Fedora-directory-commits] ldapserver configure, 1.59, 1.60 configure.ac, 1.35, 1.36 aclocal.m4, 1.48, 1.49 missing, 1.38, 1.39 install-sh, 1.38, 1.39 depcomp, 1.38, 1.39 compile, 1.37, 1.38 Makefile.in, 1.66, 1.67 config.sub, 1.37, 1.38 config.guess, 1.37, 1.38
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4386/ldapserver
Modified Files:
configure configure.ac aclocal.m4 missing install-sh depcomp
compile Makefile.in config.sub config.guess
Log Message:
Resolves: bug 251549
Bug Description: Change filesystem path naming from "fedora-ds" to "dirsrv"
Reviewed by: nkinder (Thanks!)
Fix Description: Mostly just changing the package name in configure.ac, and making sure we consistently use that in path naming (e.g. /etc/@PACKAGE_NAME@ or /etc/@PACKAGE_NAME_BASE@ for adminserver).
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Oh yes.
QA impact: Any existing tests that depend on /path/brand-ds will need to change to use dirsrv. It is highly encouraged to use a macro or variable for the package name in any scripts to minimize the impact of future package name changes.
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- configure 9 Aug 2007 23:59:59 -0000 1.59
+++ configure 13 Aug 2007 15:35:35 -0000 1.60
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0a4.
+# Generated by GNU Autoconf 2.59 for dirsrv 1.1.0b1.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -421,10 +421,10 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME='fedora-ds'
-PACKAGE_TARNAME='fedora-ds'
-PACKAGE_VERSION='1.1.0a4'
-PACKAGE_STRING='fedora-ds 1.1.0a4'
+PACKAGE_NAME='dirsrv'
+PACKAGE_TARNAME='dirsrv'
+PACKAGE_VERSION='1.1.0b1'
+PACKAGE_STRING='dirsrv 1.1.0b1'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -954,7 +954,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures fedora-ds 1.1.0a4 to adapt to many kinds of systems.
+\`configure' configures dirsrv 1.1.0b1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fedora-ds 1.1.0a4:";;
+ short | recursive ) echo "Configuration of dirsrv 1.1.0b1:";;
esac
cat <<\_ACEOF
@@ -1201,7 +1201,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-fedora-ds configure 1.1.0a4
+dirsrv configure 1.1.0b1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1215,7 +1215,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fedora-ds $as_me 1.1.0a4, which was
+It was created by dirsrv $as_me 1.1.0b1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1860,8 +1860,8 @@
# Define the identity of the package.
- PACKAGE='fedora-ds'
- VERSION='1.1.0a4'
+ PACKAGE='dirsrv'
+ VERSION='1.1.0b1'
cat >>confdefs.h <<_ACEOF
@@ -25696,7 +25696,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by fedora-ds $as_me 1.1.0a4, which was
+This file was extended by dirsrv $as_me 1.1.0b1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25759,7 +25759,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-fedora-ds config.status 1.1.0a4
+dirsrv config.status 1.1.0b1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- configure.ac 2 Aug 2007 14:39:00 -0000 1.35
+++ configure.ac 13 Aug 2007 15:35:35 -0000 1.36
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
# This version is the version returned by ns-slapd -v
-AC_INIT([fedora-ds], [1.1.0a4], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv], [1.1.0b1], [http://bugzilla.redhat.com/])
# AC_CONFIG_HEADER must be called right after AC_INIT.
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
16 years, 8 months