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

[Dan Horák]

commit c42a5295d41f557713d5c806ade8af00f73bb41d
Author: Dan Horák <dan at danny.cz>
Date:   Tue Aug 9 11:31:49 2011 +0200

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

 .gitignore  |    1 +
 sources     |    2 +-
 zabbix.spec |   14 ++++++++++----
 3 files changed, 12 insertions(+), 5 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 9fa7052..df930db 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -6,8 +6,8 @@
 #   various backup files (*.rpm{orig,new,save}, *~ etc) in that dir.
 
 Name:           zabbix
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.6
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -427,9 +427,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/%{name} zabbix || :
+    useradd -r -g zabbix -d %{_localstatedir}/lib/%{srcname} -s /sbin/nologin \
+    -c "Zabbix Monitoring System" zabbix
+:
 
 %post server
 /sbin/chkconfig --add zabbix-server
@@ -603,6 +605,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
+
 * Mon May 23 2011 Dan Horák <dan[at]danny.cz> - 1.8.5-2
 - include /var/lib/zabbix and /etc/zabbix/externalscripts dirs in package (#704181)
 - add snmp trap receiver script in package (#705331)