- 1.8.8

[packages/zabbix.git] / zabbix.spec

diff --git a/zabbix.spec b/zabbix.spec
index 87c4b6bc288aa3bb3106208da01e1a9920da1018..eb2e39cf8ec2fc170fb9f0ee7c9ac314a7b3670f 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -8,16 +8,18 @@
 Summary:       zabbix - network monitoring software
 Summary(pl.UTF-8):     zabbix - oprogramowanie do monitorowania sieci
 Name:          zabbix
-Version:       1.8.6
+Version:       1.8.8
 Release:       0.1
 License:       GPL v2+
 Group:         Networking/Utilities
 Source0:       http://dl.sourceforge.net/zabbix/%{name}-%{version}.tar.gz
-# Source0-md5: 4642fd263167211a73a02fe7f3bcd998
+# Source0-md5: 8e38079640cf50c215f36dfd3125a6d3
 Source1:       %{name}-agent.inetd
 Source2:       %{name}-apache.conf
 URL:           http://zabbix.sourceforge.net/
 %{!?with_pgsql:BuildRequires:  mysql-devel}
+BuildRequires: curl-devel
+BuildRequires: iksemel-devel
 BuildRequires: net-snmp-devel
 BuildRequires: openldap-devel >= 2.4.6
 BuildRequires: openssl-devel >= 0.9.7d
@@ -95,6 +97,12 @@ Summary:     PHP frontend for zabbix
 Summary(pl.UTF-8):     Interfejs PHP dla zabbiksa
 Group:         Applications/WWW
 Requires:      php(gd)
+Requires:      php-bcmath
+Requires:      php-ctype
+Requires:      php-mbstring
+Requires:      php-pcre
+Requires:      php-sockets
+Requires:      php-session
 %{!?with_pgsql:Requires:       php-mysql}
 %{?with_pgsql:Requires:        php-pgsql}
 Requires:      webapps
@@ -156,6 +164,8 @@ Ten pakiet zawiera serwer zabbiksa.
        --enable-agent \
        --with-net-snmp \
        --with-ldap \
+       --with-jabber \
+       --with-libcurl
 #      --with-ucd-snmp=DIR \
 
 %{__make}
@@ -169,8 +179,8 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{sysconfig/rc-inetd,webapps/%{_we
 
 install misc/conf/zabbix_{a*,s*}.conf $RPM_BUILD_ROOT%{_sysconfdir}
 cp -r frontends $RPM_BUILD_ROOT%{_appdir}
-mv -f $RPM_BUILD_ROOT%{_appdir}/frontends/php/include/db.inc.php $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
-ln -s %{_webapps}/%{_webapp}/db.inc.php $RPM_BUILD_ROOT%{_appdir}/frontends/php/include
+#mv -f $RPM_BUILD_ROOT%{_appdir}/frontends/php/include/db.inc.php $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
+#ln -s %{_webapps}/%{_webapp}/db.inc.php $RPM_BUILD_ROOT%{_appdir}/frontends/php/include
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/zabbix-agent
 install %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
 install %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
@@ -194,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 111 zabbix
 %useradd -d / -u 111 -g zabbix -c "Zabbix User" -s /bin/false zabbix
 
-%post
+%post server
 if [ "$1" = 1 ]; then
        %banner -e %{name} <<-EOF
        You should create database for Zabbix.
@@ -230,7 +240,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README ChangeLog create upgrades
+%doc AUTHORS NEWS README ChangeLog
 %attr(750,root,zabbix) %dir %{_sysconfdir}
 %dir %{_appdir}
 %dir %{_appdir}/frontends
@@ -265,6 +275,7 @@ fi
 
 %files server
 %defattr(644,root,root,755)
+%doc create upgrades
 %attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_server.conf
 %attr(755,root,root) %{_sbindir}/zabbix_server
 %{_mandir}/man8/zabbix_server*