--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2010/02/17 12:53:59	1.20
+++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2010/02/17 18:45:50	1.21
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-agent.spec,v 1.19 2010/01/04 19:30:22 vip-ire Exp $
+# $Id: smeserver-zabbix-agent.spec,v 1.20 2010/02/17 12:53:59 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-agent
 %define version 0.1
-%define release 40
+%define release 39
 Summary: sme server integration of zabbix agent
 Name: %{name}
 Version: %{version}
@@ -63,8 +63,7 @@ Patch46: smeserver-zabbix-agent-0.1-repo
 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-userparam_check_cups.patch
-Patch51: smeserver-zabbix-agent-0.1-megaraid_options.patch
+Patch50: smeserver-zabbix-agent-0.1-megaraid_options.patch
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -80,12 +79,9 @@ Zabbix is an entreprise-class open sourc
 solution
 
 %changelog
-* Wed Feb 17 2010 Daniel B. <daniel@firewall-services.com> 0.1-40
+* Wed Feb 17 2010 Daniel B. <daniel@firewall-services.com> 0.1-39
 - update megaraid-parser.pl script with options to ignore some errors
 
-* Wed Jan 20 2010 Daniel B. <daniel@firewall-services.com> 0.1-39
-- Add simple cups printers monitoring
-
 * 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)
@@ -287,7 +283,6 @@ solution
 %patch48 -p1
 %patch49 -p1
 %patch50 -p1
-%patch51 -p1
 
 %build
 %{__mkdir_p} root/var/lib/zabbix/tmp