From 4c55c8499279fac87222ccfb6de4a3176053615b Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 16 Apr 2013 12:24:15 +0200
Subject: [PATCH] update file names in spec file

---
 smeserver-zabbix-agent.spec | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/smeserver-zabbix-agent.spec b/smeserver-zabbix-agent.spec
index c60f071..e6a9ba3 100644
--- a/smeserver-zabbix-agent.spec
+++ b/smeserver-zabbix-agent.spec
@@ -3,8 +3,8 @@
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-agent
-%define version 0.2.1
-%define release 1
+%define version 0.3.0
+%define release 1.beta0
 Summary: sme server integration of zabbix agent
 Name: %{name}
 Version: %{version}
@@ -19,6 +19,7 @@ BuildRequires: e-smith-devtools
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 7.0
 Requires: zabbix-agent => 2.0.0
+Requires: zabbix-agent-addons
 Requires: smeserver-remoteuseraccess
 Requires: perl(IO::Socket)
 Requires: perl(Net::SSLeay)
@@ -31,6 +32,10 @@ Zabbix is an entreprise-class open source distributed monitoring
 solution
 
 %changelog
+* Tue Apr 16 2013 Daniel B. <daniel@firewall-services.com> - 0.3.0-1.sme
+- Huge cleanup
+- Requires zabbix-agent-addons
+
 * Thu Apr 11 2013 Daniel B. <daniel@firewall-services.com> - 0.2.1-1.sme
 - Improvement in mdstat-parser.pl
 
@@ -246,18 +251,14 @@ rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 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/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)' \
+	--file /var/lib/zabbix/bin/check_mysqladmin_status_sudo 'attr(0750,root,zabbix)' \
+	--file /var/lib/zabbix/bin/util_logtail 'attr(0755,root,root)' \
+	--file /var/lib/zabbix/bin/util_count_mail_in 'attr(0755,root,root)' \
+	--file /var/lib/zabbix/bin/util_count_mail_out 'attr(0755,root,root)' \
+	--file /var/lib/zabbix/bin/util_parse_mail_in 'attr(0755,root,root)' \
+	--file /var/lib/zabbix/bin/util_parse_mail_out 'attr(0755,root,root)' \
 	--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)' \
+        --file /var/lib/zabbix/bin/util_send_status_mail 'attr(0755,root,root)' \
 	--dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \
 	> %{name}-%{version}-filelist
 echo "%doc CHANGELOG.git" >> %{name}-%{version}-filelist