--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2010/06/23 15:17:20	1.25
+++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2011/10/28 11:06:39	1.32
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-agent.spec,v 1.24 2010/05/03 16:42:06 vip-ire Exp $
+# $Id: smeserver-zabbix-agent.spec,v 1.31 2011/10/26 16:33:35 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-agent
 %define version 0.1
-%define release 43
+%define release 50
 Summary: sme server integration of zabbix agent
 Name: %{name}
 Version: %{version}
@@ -70,6 +70,14 @@ Patch53: smeserver-zabbix-agent-0.1-disa
 Patch54: smeserver-zabbix-agent-0.1-critical_vs_warning.patch
 Patch55: smeserver-zabbix-agent-0.1-userparam_squid.patch
 Patch56: smeserver-zabbix-agent-0.1-hostname_from_db.patch
+Patch57: smeserver-zabbix-agent-0.1-userparam_diskio.patch
+Patch58: smeserver-zabbix-agent-0.1-userparam_asterisk.patch
+Patch59: smeserver-zabbix-agent-0.1-userparam_lvm.patch
+Patch60: smeserver-zabbix-agent-0.1-add_usr_sbin_in_path.patch
+Patch61: smeserver-zabbix-agent-0.1-statusmail.patch
+Patch62: smeserver-zabbix-agent-0.1-configure_timeout.patch
+Patch63: smeserver-zabbix-agent-0.1-better_asterisk_monitoring.patch
+Patch64: smeserver-zabbix-agent-0.1-fix_closing_bracket.patch
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -85,6 +93,29 @@ Zabbix is an entreprise-class open sourc
 solution
 
 %changelog
+* Fri Oct 28 2011 Daniel B. <daniel@firewall-services.com> - 0.1-50.sme
+- Fix a closing bracket in templates
+
+* Wed Oct 26 2011 Daniel B. <daniel@firewall-services.com> - 0.1-49.sme
+- Add better asterisk monitoring capabilities
+
+* Fri Jul 08 2011 Daniel B. <daniel@firewall-services.com> - 0.1-48.sme
+- Configure timeout from the DB (prop TimeOut)
+
+* Wed May 04 2011 Daniel B. <daniel@firewall-services.com> 0.1-47
+- Send status mail with some logs and active connexions (StatusMail prop)
+
+* Thu Sep 02 2010 Daniel B. <daniel@firewall-services.com> 0.1-46
+- Add /usr/sbin in path for check_lvm and check_asterisk
+
+* Thu Sep 02 2010 Daniel B. <daniel@firewall-services.com> 0.1-45
+- Add basic asterisk monitoring support
+- Add basic LVM monitoring support
+
+* Wed Aug 04 2010 Daniel B. <daniel@firewall-services.com> 0.1-44
+- Support up to 8 disks for I/O monitoring. Report valid 0 value
+  for non existing ones to prevent errors in server's log
+
 * Wed Jun 23 2010 Daniel B. <daniel@firewall-services.com> 0.1-43
 - Possibility to set Hostname from the DB [SME: 6083]
 
@@ -310,6 +341,14 @@ solution
 %patch54 -p1
 %patch55 -p1
 %patch56 -p1
+%patch57 -p1
+%patch58 -p1
+%patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
 
 %build
 %{__mkdir_p} root/var/lib/zabbix/tmp
@@ -329,6 +368,9 @@ rm -f %{name}-%{version}-filelist
 	--file /var/lib/zabbix/bin/parse_mail_in.pl 'attr(0755,root,root)' \
 	--file /var/lib/zabbix/bin/parse_mail_out.pl 'attr(0755,root,root)' \
 	--file /var/lib/zabbix/bin/sensors 'attr(0750,root,zabbix) %config(noreplace)' \
+	--file /var/lib/zabbix/bin/check_asterisk 'attr(0750,root,zabbix)' \
+	--file /var/lib/zabbix/bin/check_lvm 'attr(0755,root,root)' \
+        --file /var/lib/zabbix/bin/mailstatus.pl 'attr(0755,root,root)' \
 	--dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \
 	> %{name}-%{version}-filelist