[Fedora-directory-commits] adminserver Makefile.am, 1.38, 1.39 configure.ac, 1.24, 1.25 aclocal.m4, 1.38, 1.39 configure, 1.42, 1.43 missing, 1.28, 1.29 install-sh, 1.28, 1.29 Makefile.in, 1.45, 1.46 depcomp, 1.28, 1.29 config.sub, 1.28, 1.29 config.guess, 1.28, 1.29 compile, 1.27, 1.28
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Thu Jan 10 16:48:40 UTC 2008
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20492/adminserver
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh Makefile.in depcomp config.sub config.guess compile
Log Message:
Resolves: bug 249548
Description: Review Request: fedora-ds-admin - Administration server used by Fedora Directory Server
Fix Description: packaging, spec, and initscript fixes for package review
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile.am 17 Dec 2007 20:10:04 -0000 1.38
+++ Makefile.am 10 Jan 2008 16:48:38 -0000 1.39
@@ -147,7 +147,7 @@
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
-initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME)
+initconfig_DATA = admserv/cfgstuff/$(PACKAGE_NAME)
ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
admserv/schema/ldif/01nsroot.ldif.tmpl \
@@ -198,7 +198,7 @@
admserv/newinst/src/migrate-ds-admin.pl \
admserv/newinst/src/register-ds-admin.pl
-perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \
+perl_DATA = admserv/newinst/src/ASDialogs.pm \
admserv/newinst/src/AdminUtil.pm \
admserv/newinst/src/AdminServer.pm \
admserv/newinst/src/ConfigDSDialogs.pm \
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- configure.ac 18 Dec 2007 19:55:22 -0000 1.24
+++ configure.ac 10 Jan 2008 16:48:38 -0000 1.25
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dirsrv-admin], [1.1.1], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv-admin], [1.1.2], [http://bugzilla.redhat.com/])
AC_CONFIG_SRCDIR([admserv/cgi-src40/viewlog.c])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- configure 18 Dec 2007 19:55:22 -0000 1.42
+++ configure 10 Jan 2008 16:48:38 -0000 1.43
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.1.
+# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.2.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='dirsrv-admin'
PACKAGE_TARNAME='dirsrv-admin'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='dirsrv-admin 1.1.1'
+PACKAGE_VERSION='1.1.2'
+PACKAGE_STRING='dirsrv-admin 1.1.2'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
ac_unique_file="admserv/cgi-src40/viewlog.c"
@@ -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 dirsrv-admin 1.1.1 to adapt to many kinds of systems.
+\`configure' configures dirsrv-admin 1.1.2 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 dirsrv-admin 1.1.1:";;
+ short | recursive ) echo "Configuration of dirsrv-admin 1.1.2:";;
esac
cat <<\_ACEOF
@@ -1202,7 +1202,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-dirsrv-admin configure 1.1.1
+dirsrv-admin configure 1.1.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1216,7 +1216,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dirsrv-admin $as_me 1.1.1, which was
+It was created by dirsrv-admin $as_me 1.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1860,7 +1860,7 @@
# Define the identity of the package.
PACKAGE='dirsrv-admin'
- VERSION='1.1.1'
+ VERSION='1.1.2'
cat >>confdefs.h <<_ACEOF
@@ -25613,7 +25613,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by dirsrv-admin $as_me 1.1.1, which was
+This file was extended by dirsrv-admin $as_me 1.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25676,7 +25676,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-dirsrv-admin config.status 1.1.1
+dirsrv-admin config.status 1.1.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Makefile.in 18 Dec 2007 19:55:23 -0000 1.45
+++ Makefile.in 10 Jan 2008 16:48:38 -0000 1.46
@@ -93,12 +93,12 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" \
"$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" \
- "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" \
- "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" \
+ "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" \
"$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" \
"$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" \
- "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" \
- "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"
+ "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(ldifdir)" \
+ "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \
+ "$(DESTDIR)$(perldir)" "$(DESTDIR)$(propertydir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libds_admin_serv_la_LIBADD =
@@ -202,11 +202,9 @@
cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-initconfigSCRIPT_INSTALL = $(INSTALL_SCRIPT)
nodist_cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-perlSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) $(init_SCRIPTS) \
- $(initconfig_SCRIPTS) $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS)
+ $(nodist_cmdbin_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -258,13 +256,16 @@
dist_htmlDATA_INSTALL = $(INSTALL_DATA)
dist_iconDATA_INSTALL = $(INSTALL_DATA)
infDATA_INSTALL = $(INSTALL_DATA)
+initconfigDATA_INSTALL = $(INSTALL_DATA)
ldifDATA_INSTALL = $(INSTALL_DATA)
nodist_configDATA_INSTALL = $(INSTALL_DATA)
nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
+perlDATA_INSTALL = $(INSTALL_DATA)
propertyDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_help_DATA) $(dist_html_DATA) $(dist_icon_DATA) \
- $(inf_DATA) $(ldif_DATA) $(nodist_config_DATA) \
- $(nodist_property_DATA) $(property_DATA)
+ $(inf_DATA) $(initconfig_DATA) $(ldif_DATA) \
+ $(nodist_config_DATA) $(nodist_property_DATA) $(perl_DATA) \
+ $(property_DATA)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = mod_admserv mod_restartd
@@ -542,7 +543,7 @@
@CXXLINK_REQUIRED_FALSE at MYLINK = $(LINK)
@CXXLINK_REQUIRED_TRUE at MYLINK = $(CXXLINK)
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
-initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME)
+initconfig_DATA = admserv/cfgstuff/$(PACKAGE_NAME)
ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
admserv/schema/ldif/01nsroot.ldif.tmpl \
admserv/schema/ldif/02globalpreferences.ldif.tmpl \
@@ -587,7 +588,7 @@
admserv/newinst/src/migrate-ds-admin.pl \
admserv/newinst/src/register-ds-admin.pl
-perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \
+perl_DATA = admserv/newinst/src/ASDialogs.pm \
admserv/newinst/src/AdminUtil.pm \
admserv/newinst/src/AdminServer.pm \
admserv/newinst/src/ConfigDSDialogs.pm \
@@ -1290,25 +1291,6 @@
echo " rm -f '$(DESTDIR)$(initdir)/$$f'"; \
rm -f "$(DESTDIR)$(initdir)/$$f"; \
done
-install-initconfigSCRIPTS: $(initconfig_SCRIPTS)
- @$(NORMAL_INSTALL)
- test -z "$(initconfigdir)" || $(mkdir_p) "$(DESTDIR)$(initconfigdir)"
- @list='$(initconfig_SCRIPTS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(initconfigSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(initconfigdir)/$$f'"; \
- $(initconfigSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(initconfigdir)/$$f"; \
- else :; fi; \
- done
-
-uninstall-initconfigSCRIPTS:
- @$(NORMAL_UNINSTALL)
- @list='$(initconfig_SCRIPTS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " rm -f '$(DESTDIR)$(initconfigdir)/$$f'"; \
- rm -f "$(DESTDIR)$(initconfigdir)/$$f"; \
- done
install-nodist_cmdbinSCRIPTS: $(nodist_cmdbin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(cmdbindir)" || $(mkdir_p) "$(DESTDIR)$(cmdbindir)"
@@ -1328,25 +1310,6 @@
echo " rm -f '$(DESTDIR)$(cmdbindir)/$$f'"; \
rm -f "$(DESTDIR)$(cmdbindir)/$$f"; \
done
-install-perlSCRIPTS: $(perl_SCRIPTS)
- @$(NORMAL_INSTALL)
- test -z "$(perldir)" || $(mkdir_p) "$(DESTDIR)$(perldir)"
- @list='$(perl_SCRIPTS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(perlSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(perldir)/$$f'"; \
- $(perlSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(perldir)/$$f"; \
- else :; fi; \
- done
-
-uninstall-perlSCRIPTS:
- @$(NORMAL_UNINSTALL)
- @list='$(perl_SCRIPTS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " rm -f '$(DESTDIR)$(perldir)/$$f'"; \
- rm -f "$(DESTDIR)$(perldir)/$$f"; \
- done
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -1864,6 +1827,23 @@
echo " rm -f '$(DESTDIR)$(infdir)/$$f'"; \
rm -f "$(DESTDIR)$(infdir)/$$f"; \
done
+install-initconfigDATA: $(initconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(initconfigdir)" || $(mkdir_p) "$(DESTDIR)$(initconfigdir)"
+ @list='$(initconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(initconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(initconfigdir)/$$f'"; \
+ $(initconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(initconfigdir)/$$f"; \
+ done
+
+uninstall-initconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(initconfig_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(initconfigdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(initconfigdir)/$$f"; \
+ done
install-ldifDATA: $(ldif_DATA)
@$(NORMAL_INSTALL)
test -z "$(ldifdir)" || $(mkdir_p) "$(DESTDIR)$(ldifdir)"
@@ -1915,6 +1895,23 @@
echo " rm -f '$(DESTDIR)$(propertydir)/$$f'"; \
rm -f "$(DESTDIR)$(propertydir)/$$f"; \
done
+install-perlDATA: $(perl_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(perldir)" || $(mkdir_p) "$(DESTDIR)$(perldir)"
+ @list='$(perl_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(perlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perldir)/$$f'"; \
+ $(perlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perldir)/$$f"; \
+ done
+
+uninstall-perlDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(perl_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(perldir)/$$f'"; \
+ rm -f "$(DESTDIR)$(perldir)/$$f"; \
+ done
install-propertyDATA: $(property_DATA)
@$(NORMAL_INSTALL)
test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)"
@@ -2213,7 +2210,7 @@
$(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(propertydir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -2278,9 +2275,9 @@
install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \
install-cmdbinSCRIPTS install-dist_helpDATA \
install-dist_htmlDATA install-dist_iconDATA install-infDATA \
- install-initSCRIPTS install-initconfigSCRIPTS install-ldifDATA \
+ install-initSCRIPTS install-initconfigDATA install-ldifDATA \
install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
- install-nodist_propertyDATA install-perlSCRIPTS \
+ install-nodist_propertyDATA install-perlDATA \
install-propertyDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -2317,10 +2314,10 @@
uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
uninstall-dist_htmlDATA uninstall-dist_iconDATA \
uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
- uninstall-initconfigSCRIPTS uninstall-ldifDATA \
+ uninstall-initconfigDATA uninstall-ldifDATA \
uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
- uninstall-perlSCRIPTS uninstall-propertyDATA
+ uninstall-perlDATA uninstall-propertyDATA
uninstall-info: uninstall-info-recursive
@@ -2337,10 +2334,10 @@
install-data-am install-data-hook install-dist_helpDATA \
install-dist_htmlDATA install-dist_iconDATA install-exec \
install-exec-am install-infDATA install-info install-info-am \
- install-initSCRIPTS install-initconfigSCRIPTS install-ldifDATA \
+ install-initSCRIPTS install-initconfigDATA install-ldifDATA \
install-libLTLIBRARIES install-man \
install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
- install-nodist_propertyDATA install-perlSCRIPTS \
+ install-nodist_propertyDATA install-perlDATA \
install-propertyDATA install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic maintainer-clean-recursive \
@@ -2351,10 +2348,10 @@
uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
uninstall-dist_htmlDATA uninstall-dist_iconDATA \
uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
- uninstall-initconfigSCRIPTS uninstall-ldifDATA \
+ uninstall-initconfigDATA uninstall-ldifDATA \
uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
- uninstall-perlSCRIPTS uninstall-propertyDATA
+ uninstall-perlDATA uninstall-propertyDATA
define NL
\\n
More information about the Fedora-directory-commits
mailing list