--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2009/12/02 22:29:22	1.17
+++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2010/03/12 17:09:27	1.22
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-agent.spec,v 1.16 2009/09/25 08:28:06 vip-ire Exp $
+# $Id: smeserver-zabbix-agent.spec,v 1.21 2010/02/17 18:45:50 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-agent
 %define version 0.1
-%define release 36
+%define release 40
 Summary: sme server integration of zabbix agent
 Name: %{name}
 Version: %{version}
@@ -61,6 +61,10 @@ Patch44: smeserver-zabbix-agent-0.1-user
 Patch45: smeserver-zabbix-agent-0.1-smart_missing_return.patch
 Patch46: smeserver-zabbix-agent-0.1-report_0_for_non_existing_drives.patch
 Patch47: smeserver-zabbix-agent-0.1-run_megaraid_parser_as_root.patch
+Patch48: smeserver-zabbix-agent-0.1-run_megaraid_parser_as_root2.patch
+Patch49: smeserver-zabbix-agent-0.1-several_ups.patch
+Patch50: smeserver-zabbix-agent-0.1-megaraid_options.patch
+Patch51: smeserver-zabbix-agent-0.1-new_qpsmtpd.patch
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -76,6 +80,19 @@ Zabbix is an entreprise-class open sourc
 solution
 
 %changelog
+* Fri Mar 12 2010 Daniel B. <daniel@firewall-services.com> 0.1-40
+- update regex for incomming mail stats for newer qpsmtpd
+
+* Wed Feb 17 2010 Daniel B. <daniel@firewall-services.com> 0.1-39
+- update megaraid-parser.pl script with options to ignore some errors
+
+* Mon Jan 4 2010 Daniel B. <daniel@firewall-services.com> 0.1-38
+- Change UPS UserParameters to use wildcard, so you can monitor several UPS
+  easily (require changes in the templates on the server side)
+
+* Sun Dec 6 2009 Daniel B. <daniel@firewall-services.com> 0.1-37
+- Call megaraid-parser.pl scripts with sudo in zabbix_agentd.conf
+
 * Wed Dec 2 2009 Daniel B. <daniel@firewall-services.com> 0.1-36
 - Run megaraid-parser.pl as root (with sudo) instead of granting 
   zabbix user unrestricted access to MegaCli
@@ -267,6 +284,10 @@ solution
 %patch45 -p1
 %patch46 -p1
 %patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
 
 %build
 %{__mkdir_p} root/var/lib/zabbix/tmp