Update project name, fix make clean, update spec file.

refs #4926

Signed-off-by: Michael Friedrich <michael.friedrich@netways.de>
This commit is contained in:
Michael Friedrich 2013-10-22 10:30:41 +02:00 committed by Marius Hein
parent 2ce8d940e4
commit c4efe02f8f
4 changed files with 17 additions and 18 deletions

View File

@ -40,7 +40,6 @@ update: install-application
# Removes files created by ./configure # Removes files created by ./configure
# #
clean: clean:
fi; \
if [ -f ./Makefile ];then \ if [ -f ./Makefile ];then \
rm ./Makefile; \ rm ./Makefile; \
fi; \ fi; \

22
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for IcingaWeb 1.0.0. # Generated by GNU Autoconf 2.63 for IcingaWeb2 1.0.0.
# #
# Report bugs to <info@icinga.org>. # Report bugs to <info@icinga.org>.
# #
@ -594,10 +594,10 @@ MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh} SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='IcingaWeb' PACKAGE_NAME='IcingaWeb2'
PACKAGE_TARNAME='icingaweb' PACKAGE_TARNAME='icingaweb2'
PACKAGE_VERSION='1.0.0' PACKAGE_VERSION='1.0.0'
PACKAGE_STRING='IcingaWeb 1.0.0' PACKAGE_STRING='IcingaWeb2 1.0.0'
PACKAGE_BUGREPORT='info@icinga.org' PACKAGE_BUGREPORT='info@icinga.org'
ac_default_prefix=/usr/local/icingaweb ac_default_prefix=/usr/local/icingaweb
@ -1284,7 +1284,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures IcingaWeb 1.0.0 to adapt to many kinds of systems. \`configure' configures IcingaWeb2 1.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1332,7 +1332,7 @@ Fine tuning of the installation directories:
--infodir=DIR info documentation [DATAROOTDIR/info] --infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale] --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man] --mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/icingaweb] --docdir=DIR documentation root [DATAROOTDIR/doc/icingaweb2]
--htmldir=DIR html documentation [DOCDIR] --htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR]
@ -1345,7 +1345,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of IcingaWeb 1.0.0:";; short | recursive ) echo "Configuration of IcingaWeb2 1.0.0:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1516,7 +1516,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
IcingaWeb configure 1.0.0 IcingaWeb2 configure 1.0.0
generated by GNU Autoconf 2.63 generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1530,7 +1530,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by IcingaWeb $as_me 1.0.0, which was It was created by IcingaWeb2 $as_me 1.0.0, which was
generated by GNU Autoconf 2.63. Invocation command line was generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@ $ $0 $@
@ -3512,7 +3512,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by IcingaWeb $as_me 1.0.0, which was This file was extended by IcingaWeb2 $as_me 1.0.0, which was
generated by GNU Autoconf 2.63. Invocation command line was generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -3562,7 +3562,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\ ac_cs_version="\\
IcingaWeb config.status 1.0.0 IcingaWeb2 config.status 1.0.0
configured by $0, generated by GNU Autoconf 2.63, configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.61]) AC_PREREQ([2.61])
AC_INIT([IcingaWeb], [1.0.0], [info@icinga.org]) AC_INIT([IcingaWeb2], [1.0.0], [info@icinga.org])
AC_PREFIX_DEFAULT(/usr/local/icingaweb) AC_PREFIX_DEFAULT(/usr/local/icingaweb)
if test "x$prefix" = "xNONE" ; then if test "x$prefix" = "xNONE" ; then

View File

@ -40,7 +40,7 @@
%endif %endif
Summary: Open Source host, service and network monitoring Web UI Summary: Open Source host, service and network monitoring Web UI
Name: icingaweb Name: icingaweb2
Version: 1.0.0 Version: 1.0.0
Release: %{revision}%{?dist} Release: %{revision}%{?dist}
License: GPLv2 License: GPLv2
@ -244,10 +244,10 @@ fi
# main dirs # main dirs
%defattr(-,root,root) %defattr(-,root,root)
%doc etc/schema doc README.RHEL.SUSE %doc etc/schema doc README.RHEL.SUSE
%{_datadir}/%{name}/application %{sharedir}/application
%{_datadir}/%{name}/library %{sharedir}/library
%{_datadir}/%{name}/public %{sharedir}/public
%{_datadir}/%{name}/modules %{sharedir}/modules
# configs # configs
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) %attr(-,root,root) %{apacheconfdir}/icingaweb.conf %config(noreplace) %attr(-,root,root) %{apacheconfdir}/icingaweb.conf