--- rpms/zabbix/contribs7/zabbix.spec	2009/03/02 23:53:30	1.2
+++ rpms/zabbix/contribs7/zabbix.spec	2009/11/13 23:37:44	1.9
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: zabbix.spec,v 1.8 2009/09/29 17:48:17 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 Name:           zabbix
-Version:        1.6.2
-Release:        3%{?dist}
+Version:        1.6.7
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -17,9 +17,8 @@ Source3:        zabbix-agent.init
 Source4:        zabbix-proxy.init
 Source5:        zabbix-logrotate.in
 
-Patch0:         zabbix-1.6.2-cpustats.patch
-Patch1:		zabbix-1.6.2-curl-centos4.patch
-Patch2:		zabbix-1.6.1-snmp-fixes.patch
+Patch0: zabbix-1.6.3-curl_centos4.patch
+#Patch1: zabbix-1.6.6-ZBX-1027.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -163,7 +162,7 @@ Summary:         Zabbix Web Frontend
 Group:           Applications/Internet
 Requires:        php
 Requires:	 php-gd
-Requires:	 php-bcmath
+#Requires:	 php-bcmath
 Requires:        zabbix = %{version}-%{release}
 Requires:	 zabbix-web-database = %{version}-%{release}
 
@@ -202,9 +201,7 @@ Zabbix web frontend for SQLite
 
 %prep
 %setup0 -q
-%patch0 -p1 -b .cpustats
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1
 
 chmod -R a+rX .
 
@@ -471,6 +468,29 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Nov 13 2009 Daniel B. <daniel@firewall-services.com> 1.6.7-2
+- - Upstream upgrade to 1.6.7
+
+* Tue Sep 29 2009 Daniel B. <daniel@firewall-services.com> 1.6.6-2
+- Fix trigger verification (ZBX-1027)
+
+* Tue Sep 29 2009 Daniel B. <daniel@firewall-services.com> 1.6.6-1
+- Upstream upgrade to 1.6.6
+
+* Tue Jun 16 2009 Daniel B. <daniel@firewall-services.com> 1.6.5-1
+- Upstream upgrade to 1.6.5
+
+* Mon Apr 06 2009 Daniel B. <daniel@firewall-services.com> 1.6.4-1
+- Upstream upgrade to 1.6.4
+
+* Fri Mar 27 2009 Daniel B. <daniel@firewall-services.com> 1.6.3-0
+- Upstream upgrade to 1.6.3
+- Remove CPUstat patch
+- Remove snmp fixes (not needed anymore)
+
+* Thu Mar 03 2009 Daniel B. <daniel@firewall-services.com> 1.6.2-4
+- Comment hard-coded php-bcmath dependencie as php4 includes this module
+
 * Wed Jan 30 2009 Daniel B. <daniel@firewall-services.com> 1.6.2-3
 - Added patch so it can compile on CentOS 4 (curl 7.12.1)