Hello community,
here is the log from the commit of package nagiosgrapher
checked in at Thu Dec 7 21:11:44 CET 2006.
--------
--- nagiosgrapher/nagiosgrapher.changes 2006-11-17 12:24:16.000000000 +0100
+++ /mounts/work_src_done/STABLE/nagiosgrapher/nagiosgrapher.changes 2006-12-03 11:17:04.000000000 +0100
@@ -1,0 +2,16 @@
+Sun Dec 3 11:00:55 CET 2006 - tsieden@suse.de
+
+- removed BuildRequires which are not implicitly needed for build
+- "notes" functionality (wiki link) disabled by default
+- beautify /etc/nagios/ngraph.ncfg, removed unneeded username
+
+-------------------------------------------------------------------
+Sat Dec 2 10:16:42 CET 2006 - tsieden@suse.de
+
+- update to version 1.6.1-RC2
+ * fixed Pagebrowser
+ * page also for GPRINTS/COMMENTS
+ * new layouts
+ * mod_perl compatibility
+
+-------------------------------------------------------------------
Old:
----
NagiosGrapher-1.6.1-rc1-config.layout.patch
NagiosGrapher-1.6.1-rc1-configure.ac.patch
NagiosGrapher-1.6.1-rc1.tar.bz2
New:
----
NagiosGrapher-1.6.1-rc2-config.layout.patch
NagiosGrapher-1.6.1-rc2-configure.ac.patch
NagiosGrapher-1.6.1-rc2-ngraph.ncfg.in.patch
NagiosGrapher-1.6.1-rc2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nagiosgrapher.spec ++++++
--- /var/tmp/diff_new_pack.mTrcOh/_old 2006-12-07 21:11:16.000000000 +0100
+++ /var/tmp/diff_new_pack.mTrcOh/_new 2006-12-07 21:11:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package nagiosgrapher (Version 1.6.1RC1)
+# spec file for package nagiosgrapher (Version 1.6.1RC2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,25 +10,27 @@
Name: nagiosgrapher
-BuildRequires: apache2 nagios nagios-www perl-Calendar-Simple perl-GD perl-PerlMagick perl-URI rrdtool
+BuildRequires: apache2 nagios nagios-www
License: GNU General Public License (GPL)
Group: System/Monitoring
-Version: 1.6.1RC1
-Release: 3
-Source0: NagiosGrapher-1.6.1-rc1.tar.bz2
+Version: 1.6.1RC2
+Release: 1
+Source0: NagiosGrapher-1.6.1-rc2.tar.bz2
Source1: nagiosgrapher.logrotate
Source2: nagiosgrapher
Source3: nagiosgrapher.README.SuSE
-Patch0: NagiosGrapher-1.6.1-rc1-config.layout.patch
+Patch0: NagiosGrapher-1.6.1-rc2-config.layout.patch
Patch1: NagiosGrapher-1.6.1-rc1-nagios_grapher.in.patch
Patch2: NagiosGrapher-1.6.1-rc1-SrvExtWriteHostextInfo.pm.patch
-Patch3: NagiosGrapher-1.6.1-rc1-configure.ac.patch
+Patch3: NagiosGrapher-1.6.1-rc2-configure.ac.patch
Patch4: NagiosGrapher-1.6.1-rc1-Makefile.in.patch
Patch5: NagiosGrapher-1.6.1-rc1-udpecho.c.patch
+Patch6: NagiosGrapher-1.6.1-rc2-ngraph.ncfg.in.patch
URL: http://www.nagiosexchange.org/42;195
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: NagiosGrapher collects the output of NagiosPlugins and generates graphs.
-Requires: apache2 nagios nagios-www perl-Calendar-Simple perl-GD perl-PerlMagick perl-URI rrdtool
+PreReq: http_daemon
+Requires: nagios nagios-www perl-Calendar-Simple perl-GD perl-PerlMagick perl-URI rrdtool
%description
The "NETWAYS Nagios Grapher" is a Graphing system which uses templates
@@ -47,7 +49,7 @@
Gerd Mueller
%prep
-%setup -c %{name}-%{version}
+%setup -n NagiosGrapher-1.6.1-rc2
cp %{S:3} README.SuSE
%patch0
%patch1
@@ -55,12 +57,13 @@
%patch3
%patch4
%patch5
+%patch6
%build
autoreconf --force --install
CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS" \
./configure --with-layout=SuSE --with-web-user=wwwrun --with-web-group=www --with-ng-interface=pipe --with-ng-loglevel=63
-make testdeps
+#make testdeps
%install
%makeinstall PERL_INC=%{perl_vendorlib}
@@ -73,6 +76,7 @@
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/nagiosgrapher
rm $RPM_BUILD_ROOT/usr/lib/nagios/contrib/*.c
rm $RPM_BUILD_ROOT/var/log/nagios/ngraph.log
+rm $RPM_BUILD_ROOT/%{perl_vendorlib}/NagiosGrapher/Hooks/SrvExtWriteHostextInfo.pm.orig
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
@@ -95,6 +99,16 @@
%{perl_vendorlib}/NagiosGrapher
%changelog -n nagiosgrapher
+* Sun Dec 03 2006 - tsieden@suse.de
+- removed BuildRequires which are not implicitly needed for build
+- "notes" functionality (wiki link) disabled by default
+- beautify /etc/nagios/ngraph.ncfg, removed unneeded username
+* Sat Dec 02 2006 - tsieden@suse.de
+- update to version 1.6.1-RC2
+ * fixed Pagebrowser
+ * page also for GPRINTS/COMMENTS
+ * new layouts
+ * mod_perl compatibility
* Fri Nov 17 2006 - tsieden@suse.de
- fixed permissions for logo pngs
- added missing includes to udpecho.c
++++++ NagiosGrapher-1.6.1-rc1-config.layout.patch -> NagiosGrapher-1.6.1-rc2-config.layout.patch ++++++
--- nagiosgrapher/NagiosGrapher-1.6.1-rc1-config.layout.patch 2006-11-16 18:23:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/nagiosgrapher/NagiosGrapher-1.6.1-rc2-config.layout.patch 2006-12-02 09:12:56.000000000 +0100
@@ -1,10 +1,11 @@
---- config.layout 2006-08-17 10:03:16.000000000 +0200
-+++ config.layout 2006-11-07 09:26:42.000000000 +0100
-@@ -82,3 +82,25 @@
- ng_rrd: /var/nagios/rrd
+--- config.layout 2006-11-17 16:23:37.000000000 +0100
++++ config.layout 2006-12-02 09:11:17.000000000 +0100
+@@ -101,5 +101,23 @@
+ ng_rrd: /var/lib/nagios/rrd
</Layout>
-+
+-
+-
+# SuSE layout
+<Layout SuSE>
+ prefix: /
@@ -15,14 +16,13 @@
+ nagios_folder_cgi: ${prefix}usr/lib/nagios/cgi
+ perl_inc: ${prefix}usr/lib/perl5/vendor_perl/5.8.8
+ nagios_contribution: ${prefix}usr/lib/nagios/contrib
-+
+ ng_config: ${prefix}etc/nagios
+ ng_config_sub: ${prefix}etc/nagios/ngraph.d
+ ng_daemon: ${prefix}var/run/nagiosgrapher
-+ ng_srvext_file: ${prefix}etc/nagios/serviceext.cfg
++ ng_srvext_file: ${prefix}etc/nagios/serviceextinfo.cfg
+ ng_srvext_dir: ${prefix}etc/nagios/serviceext
+ ng_interface_pipe: ${prefix}var/run/nagiosgrapher/ngraph.pipe
+ ng_logfile: ${prefix}var/log/nagios/ngraph.log
+ ng_rrd: ${prefix}var/lib/nagios/rrd
-+ ng_rrd_font: ${prefix}usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
++ ng_rrd_font: ${prefix}usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
+</Layout>
++++++ NagiosGrapher-1.6.1-rc1-configure.ac.patch -> NagiosGrapher-1.6.1-rc2-configure.ac.patch ++++++
--- nagiosgrapher/NagiosGrapher-1.6.1-rc1-configure.ac.patch 2006-11-16 18:42:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/nagiosgrapher/NagiosGrapher-1.6.1-rc2-configure.ac.patch 2006-12-02 09:36:54.000000000 +0100
@@ -1,14 +1,5 @@
--- configure.ac.org 2006-06-12 17:29:45.000000000 +0200
+++ configure.ac 2006-11-16 18:42:05.000000000 +0100
-@@ -248,7 +248,7 @@
-
- dnl NG_INTERFACE
- AC_ARG_WITH(ng-interface,
-- AC_HELP_STRING(--with-ng-interface=INTERFACE], [the interface to use (default: network)]),
-+ AC_HELP_STRING([--with-ng-interface=INTERFACE], [the interface to use (default: network)]),
- NG_INTERFACE=$withval,
- NG_INTERFACE=network
- )
@@ -323,7 +323,7 @@
AC_SUBST([NG_DAEMON], ${exp_ng_daemon})
AC_SUBST([NG_SRVEXT_FILE], ${exp_ng_srvext_file})
++++++ NagiosGrapher-1.6.1-rc2-ngraph.ncfg.in.patch ++++++
--- cfg/ngraph.ncfg.in 2006-09-25 17:05:55.000000000 +0200
+++ cfg/ngraph.ncfg.in 2006-12-03 11:13:44.000000000 +0100
@@ -6,14 +6,14 @@
define config {
pipe @NG_INTERFACE_PIPE@
- port 5667
- buffer 1024
- interface @NG_INTERFACE@
+ port 5667
+ buffer 1024
+ interface @NG_INTERFACE@
# please use subfolder
- pidfile @NG_DAEMON@/nagios_grapher.pid
- user @NAGIOS_PROC_USER@
- group @NAGIOS_PROC_GROUP@
+ pidfile @NG_DAEMON@/nagios_grapher.pid
+ user @NAGIOS_PROC_USER@
+ group @NAGIOS_PROC_GROUP@
# normal_check_interval
step 300
@@ -24,22 +24,22 @@
rrdpath @NG_RRD@/
tmppath /tmp/nagiosgrapher/
- fontfile /usr/local/rrdtool/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
+ fontfile /usr/local/rrdtool/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
serviceext_type @NG_SRVEXT@
serviceextinfo @NG_SRVEXT_FILE@
serviceext_path @NG_SRVEXT_DIR@
url /nagios/cgi-bin/graphs.cgi
- notes_url /wiki/index.php/$HOSTNAME$#$SERVICEDESC$
+ # notes_url /wiki/index.php/$HOSTNAME$#$SERVICEDESC$
nagios_config @NAGIOS_CONFIG@
cgi_config @NAGIOS_CONFIG_CGI@
icon_image_tag ' dot.png' border="0"></a><A TARGET="_blank" HREF="graphs.cgi?###URL###"> NagiosGrapher-1.6.1-rc2.tar.bz2 ++++++
++++ 19279 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org