--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2009/04/24 12:58:39	1.9
+++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2010/01/04 19:30:22	1.19
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-agent.spec,v 1.8 2009/04/20 10:51:35 vip-ire Exp $
+# $Id: smeserver-zabbix-agent.spec,v 1.18 2009/12/06 19:05:19 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-agent
 %define version 0.1
-%define release 28
+%define release 38
 Summary: sme server integration of zabbix agent
 Name: %{name}
 Version: %{version}
@@ -54,6 +54,15 @@ Patch37: smeserver-zabbix-agent-0.1-sens
 Patch38: smeserver-zabbix-agent-0.1-megaraid_parser.patch
 Patch39: smeserver-zabbix-agent-0.1-mail_stats_via_cron.patch
 Patch40: smeserver-zabbix-agent-0.1-mdstat_one_line.patch
+Patch41: smeserver-zabbix-agent-0.1-megaraid_parser_fix.patch
+Patch42: smeserver-zabbix-agent-0.1-cpu_num.patch
+Patch43: smeserver-zabbix-agent-0.1-megaraid_fix_raid10.patch
+Patch44: smeserver-zabbix-agent-0.1-userparam_smart.patch
+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
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -69,6 +78,41 @@ Zabbix is an entreprise-class open sourc
 solution
 
 %changelog
+* 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
+
+* Fri Sep 25 2009 Daniel B. <daniel@firewall-services.com> 0.1-35
+- Support up to 8 disks for smart monitoring. Report valid 0 value 
+  for non existing ones to prevent errors in server's log
+
+* Tue Sep 01 2009 Daniel B. <daniel@firewall-services.com> 0.1-34
+- Add missing return after smart parameters (if several disks are monitored)
+
+* Mon Aug 31 2009 Daniel B. <daniel@firewall-services.com> 0.1-33
+- Add system.smart UserParameter (monitor smart values for configured hard drives)
+
+* Wed Jul 08 2009 Daniel B. <daniel@firewall-services.com> 0.1-32
+- Fix megaraid-parser script to support RAID-10 arrays
+
+* Mon Jun 08 2009 Daniel B. <daniel@firewall-services.com> 0.1-31
+- Add cpu.number UserParameter (return the number of CPU on the host)
+
+* Wed May 06 2009 Daniel B. <daniel@firewall-services.com> 0.1-30
+- Create missing tmp directory
+
+* Mon Apr 26 2009 Daniel B. <daniel@firewall-services.com> 0.1-29
+- megaraid-parser.pl is now compatible with newer versions
+  of MegaCli
+- Fix permission on megaraid-parser.pl script
+
 * Thu Apr 23 2009 Daniel B. <daniel@firewall-services.com> 0.1-28
 - improvements in sensors script
 - Add megaraid-parser.pl script to get more accurate MegaRaid 
@@ -225,8 +269,18 @@ solution
 %patch38 -p1
 %patch39 -p1
 %patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
 
 %build
+%{__mkdir_p} root/var/lib/zabbix/tmp
 perl ./createlinks
 
 %install
@@ -236,11 +290,12 @@ rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
 	--file /var/lib/zabbix/bin/mysqladmin_status 'attr(0750,root,zabbix)' \
 	--file /var/lib/zabbix/bin/logtail.pl 'attr(0755,root,root)' \
-	--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/mail_in.sh 'attr(0755,root,root)' \
 	--file /var/lib/zabbix/bin/mail_out.sh 'attr(0755,root,root)' \
 	--file /var/lib/zabbix/bin/mdstat-parser.pl 'attr(0755,root,root)' \
+	--file /var/lib/zabbix/bin/megaraid-parser.pl 'attr(0755,root,root)' \
+	--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)' \
 	--dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \
 	> %{name}-%{version}-filelist