- 1.0

[packages/zabbix.git] / zabbix.spec

diff --git a/zabbix.spec b/zabbix.spec
index af12c3542c1507eccd0d01d49e0568c4f510c065..395a8035af31aea9f3dbc8e8793ece9209c9f236 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -1,17 +1,16 @@
 #
 # Conditional build:
-%bcond_with pgsql      # enable postgresql support (by default use mysql)
+%bcond_with pgsql      # enable PostgreSQL support (by default use mysql)
 #
-%define        _beta   beta14
 Summary:       zabbix - network monitoring software
 Summary(pl):   zabbix - oprogramowanie do monitorowania sieci
 Name:          zabbix
 Version:       1.0
-Release:       0.%{_beta}.2
+Release:       0.2
 License:       GPL v2+
 Group:         Networking/Admin
-Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}%{_beta}.tar.gz
-# Source0-md5: 0ac320c6cd99f801d8cb7923ca790419
+Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Source0-md5: e83a3b92f13942081ed2f3fe3f3084d8
 Source1:       %{name}-agent.inetd
 Source2:       %{name}-trapper.inetd
 URL:           http://zabbix.sourceforge.net/
@@ -19,7 +18,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
@@ -62,6 +61,7 @@ Summary(pl):  Interfejs PHP dla zabbiksa
 Group:         Networking/Admin
 Requires:      apache
 Requires:      php
+Requires:      php-gd
 %{!?with_pgsql:Requires:       php-mysql}
 %{?with_pgsql:Requires:        php-pgsql}
 
@@ -152,7 +152,7 @@ This package provides the zabbix sender.
 Ten pakiet zawiera program zawiadamiaj±cy zabbiksa.
 
 %prep
-%setup -q -n %{name}-%{version}%{_beta}
+%setup -q
 
 %build
 %configure \
@@ -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
@@ -226,7 +212,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/Zabbix\ Manual.pdf AUTHORS ChangeLog FAQ TODO create bin/ZabbixW32.exe
+%doc doc/Zabbix\ Manual.pdf AUTHORS NEWS README ChangeLog create upgrades bin/ZabbixW32.exe
 %attr(750,root,zabbix) %dir %{_sysconfdir}
 
 %files frontend-php