--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2009/04/20 10:51:35	1.8
+++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2009/06/08 08:38:27	1.12
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-agent.spec,v 1.7 2009/03/27 12:56:38 vip-ire Exp $
+# $Id: smeserver-zabbix-agent.spec,v 1.11 2009/05/06 15:14:39 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-agent
 %define version 0.1
-%define release 27
+%define release 31
 Summary: sme server integration of zabbix agent
 Name: %{name}
 Version: %{version}
@@ -50,6 +50,12 @@ Patch33: smeserver-zabbix-agent-0.1-user
 Patch34: smeserver-zabbix-agent-0.1-userparam_megaraid.patch
 Patch35: smeserver-zabbix-agent-0.1-userparam_yum_updates.patch
 Patch36: smeserver-zabbix-agent-0.1-userparam_sensors.patch
+Patch37: smeserver-zabbix-agent-0.1-sensors_fixes.patch
+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
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -65,6 +71,27 @@ Zabbix is an entreprise-class open sourc
 solution
 
 %changelog
+* 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 
+  conrolers informations
+- use a cronjob to parse mail logs so multiple zabbix server
+  can be used. Also, it won't repport false value if your host
+  has been unreachable for some time
+- change output of mdstat-parser.pl to report everything in one
+  line (looks like megaraid-parser)
+
 * Mon Apr 20 2009 Daniel B. <daniel@firewall-services.com> 0.1-27
 - Add updates.available to retrieve the number of updates available 
   with yum
@@ -81,7 +108,7 @@ solution
 
 * Tue Mar 24 2009 Daniel B. <daniel@firewall-services.com> 0.1-24
 - Add raid.sw.status userparameter to report software raid array status
-- Remove rabs from spec
+- Remove tabs from spec
 - Permission cleanup on scripts
 
 * Wed Mar 18 2009 Daniel B. <daniel@firewall-services.com> 0.1-23
@@ -207,11 +234,16 @@ solution
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
 
 %build
+%{__mkdir_p} root/var/lib/zabbix/tmp
 perl ./createlinks
-%{__mkdir_p} root/var/lib/zabbix/tmp/{smelog,qmail}
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -220,15 +252,14 @@ 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(0755,zabbix,zabbix)' \
-	--dir /var/lib/zabbix/tmp/smelog 'attr(0770,zabbix,smelog)' \
-	--dir /var/lib/zabbix/tmp/qmail 'attr(0770,zabbix,nofiles)' \
+	--dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \
 	> %{name}-%{version}-filelist
 
 %files -f %{name}-%{version}-filelist