- up to 1.22, updated deps, revised desc

Changed files:
    cacti-plugin-syslog-config.patch -> 1.2
    cacti-plugin-syslog.spec -> 1.17

diff --git a/cacti-plugin-syslog-config.patch b/cacti-plugin-syslog-config.patch
deleted file mode 100644 (file)
index cf80c05..0000000
--- a/cacti-plugin-syslog-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cacti-plugin-syslog-0.5.1/config.php.orig  2007-12-17 10:06:33.000000000 +0000
-+++ cacti-plugin-syslog-0.5.1/config.php       2007-12-17 10:10:35.000000000 +0000
-@@ -57,4 +57,5 @@
- $syslog_text_colors['info']           = '';
- $syslog_text_colors['debug']          = '';
- 
--?>
-\ No newline at end of file
-+include '/etc/cacti/plugin-syslog.cfg';
-+?>

diff --git a/cacti-plugin-syslog.spec b/cacti-plugin-syslog.spec
index fe9aa9327a353e4fab9ba8f5f3087915cc8f70c5..b10de0d81c2f4fb8b5981fb9372ca7da75fe8ffd 100644 (file)
--- a/cacti-plugin-syslog.spec
+++ b/cacti-plugin-syslog.spec
@@ -1,19 +1,22 @@
 %define                plugin  syslog
-%include       /usr/lib/rpm/macros.perl
-Summary:       Plugin for Cacti - Syslog
+%define                php_min_version 5.0.0
+%include       /usr/lib/rpm/macros.php
+Summary:       Syslog Viewer for Cacti
 Summary(pl.UTF-8):     Wtyczka do Cacti - Syslog
-Name:          cacti-plugin-syslog
-Version:       0.5.2
+Name:          cacti-plugin-%{plugin}
+Version:       1.22
 Release:       1
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://mirror.cactiusers.org/downloads/plugins/%{plugin}-%{version}.zip
-# Source0-md5: 1e2b1fc5b560452f937ccd0bca1af0a2
-Patch0:                %{name}-config.patch
-URL:           http://www.cactiusers.org/
-BuildRequires: rpm-perlprov
-BuildRequires: unzip
+Source0:       http://docs.cacti.net/_media/plugin:syslog-v%{version}-1.tgz
+# Source0-md5: bed7d51a915e6dd0813766a09c31f2fe
+URL:           http://docs.cacti.net/plugin:syslog
+BuildRequires: rpm-php-pearprov >= 4.4.2-11
 Requires:      cacti
+Requires:      cacti(pia) >= 2.8
+Requires:      php-common >= 4:%{php_min_version}
+Requires:      php-date
+Requires:      php-pcre
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -21,14 +24,16 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                plugindir               %{cactidir}/plugins/%{plugin}
 
 %description
-Plugin for Cacti - Syslog is a cacti integrated interface to a MySQL
-database that can be used to log events from scripts, cacti or
-whatever.
+A comprehensive Syslog Alerting tool that support very large
+partitioned databases.
 
-It is the console component for a light weight monitoring addon for
-cacti. Because the database schema is based on syslog, it can be
-configured to use a syslog-ng or kiwi's syslogd for Windows database
-so events can be correlated.
+Features:
+- Message filter
+- Message search
+- Output to screen or file
+- Date time picker
+- Event Alerter
+- Event Removal (for Events you don't want to see)
 
 %description -l pl.UTF-8
 Wtyczka do Cacti - Syslog to zintegrowany interfejs cacti do bazy
@@ -41,18 +46,18 @@ być skonfigurowany do używania sysloga-ng lub syslogd z kiwi dla
 Windows, przez co zdarzenia mogą być skorelowane.
 
 %prep
-%setup -q -c
-%patch0 -p1
+%setup -qc
+mv %{plugin}/{LICENSE,README} .
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{plugindir}
-cp -a . $RPM_BUILD_ROOT%{plugindir}
+cp -a %{plugin}/* $RPM_BUILD_ROOT%{plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README LICENSE
+%doc README
 %{plugindir}