[zabbix] updated to 1.8.6 (#729164, #729165) updated user/group adding scriptlet

[Dan Horák]

commit 23304ab0acdad71b263eddbbe0feed4317ec55e5
Author: Dan Horák <dan at danny.cz>
Date:   Tue Aug 9 11:22:41 2011 +0200

    updated to 1.8.6 (#729164, #729165)
    updated user/group adding scriptlet

 .gitignore  |    1 +
 sources     |    2 +-
 zabbix.spec |   22 ++++++++++++++--------
 3 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b7ca28..a3a73f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ zabbix-1.8.2.tar.gz
 /zabbix-1.8.3.tar.gz
 /zabbix-1.8.4.tar.gz
 /zabbix-1.8.5.tar.gz
+/zabbix-1.8.6.tar.gz
diff --git a/sources b/sources
index e3783d1..69fbecf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58b9253fb0eace1e20b2fe5c1fce32a3  zabbix-1.8.5.tar.gz
+4642fd263167211a73a02fe7f3bcd998  zabbix-1.8.6.tar.gz
diff --git a/zabbix.spec b/zabbix.spec
index fa5ebc5..4a14822 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -8,14 +8,14 @@
 %global srcname zabbix
 
 Name:           zabbix
-Version:        1.8.5
-Release:        5%{?dist}
+Version:        1.8.6
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.zabbix.com/
-Source0:        http://downloads.sourceforge.net/%{name}/%{srcname}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
@@ -205,7 +205,7 @@ Requires:        %{name} = %{version}-%{release}
 Requires:        %{name}-web-database = %{version}-%{release}
 
 %description web
-The php frontend to display the zabbix web interface.
+The php frontend to display the Zabbix web interface.
 
 %package web-mysql
 Summary:         Zabbix web frontend for MySQL
@@ -213,7 +213,7 @@ Group:           Applications/Internet
 %if 0%{?fedora} > 9 || 0%{?rhel} >= 6
 BuildArch:       noarch
 %endif
-Requires:        zabbix-web = %{version}-%{release}
+Requires:        %{name}-web = %{version}-%{release}
 Requires:        php-mysql
 Provides:        %{name}-web-database = %{version}-%{release}
 Conflicts:       %{name}-web-pgsql
@@ -229,7 +229,7 @@ Group:           Applications/Internet
 %if 0%{?fedora} > 9 || 0%{?rhel} >= 6
 BuildArch:       noarch
 %endif
-Requires:        zabbix-web = %{version}-%{release}
+Requires:        %{name}-web = %{version}-%{release}
 Requires:        php-pgsql
 Provides:        %{name}-web-database = %{version}-%{release}
 Conflicts:       %{name}-web-mysql
@@ -443,9 +443,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %pre
+getent group zabbix > /dev/null || groupadd -r zabbix
 getent passwd zabbix > /dev/null || \
-    /usr/sbin/useradd -c "Zabbix Monitoring System" \
-    -s /sbin/nologin -r -d %{_localstatedir}/lib/%{srcname} zabbix || :
+    useradd -r -g zabbix -d %{_localstatedir}/lib/%{srcname} -s /sbin/nologin \
+    -c "Zabbix Monitoring System" zabbix
+:
 
 %post server
 /sbin/chkconfig --add zabbix-server
@@ -622,6 +624,10 @@ fi
 
 
 %changelog
+* Tue Aug  9 2011 Dan Horák <dan[at]danny.cz> - 1.8.6-1
+- updated to 1.8.6 (#729164, #729165)
+- updated user/group adding scriptlet
+
 * Fri Jul  8 2011 Dan Horák <dan[at]danny.cz> - 1.8.5-5
 - rebuilt with net-snmp 5.7