- use %useradd/%groupadd macros

Changed files:
    zabbix.spec -> 1.21

diff --git a/zabbix.spec b/zabbix.spec
index dab52d6806f39bc4f9cad19291e3a340f88d6d79..e2bd8917cc0eff95e1b6f53869a03d89ff44b1db 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -19,7 +19,7 @@ URL:          http://zabbix.sourceforge.net/
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: net-snmp-devel
 BuildRequires: openssl-devel >= 0.9.7d
-BuildRequires: rpmbuild(macros) >= 1.159
+BuildRequires: rpmbuild(macros) >= 1.202
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
@@ -177,22 +177,8 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/zabbix-trapper
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`/usr/bin/getgid zabbix`" ]; then
-       if [ "`/usr/bin/getgid zabbix`" != "111" ]; then
-               echo "Error: group zabbix doesn't have gid=111. Correct this before installing zabbix." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/groupadd -g 111 zabbix
-fi
-if [ -n "`/bin/id -u zabbix 2>/dev/null`" ]; then
-       if [ "`/bin/id -u zabbix`" != "111" ]; then
-               echo "Error: user zabbix doesn't have uid=111. Correct this before installing zabbix." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -d / -u 111 -g zabbix -c "Zabbix User" -s /bin/false zabbix
-fi
+%groupadd -g 111 zabbix
+%useradd -d / -u 111 -g zabbix -c "Zabbix User" -s /bin/false zabbix
 
 %postun
 if [ "$1" = "0" ]; then