X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=zabbix.spec;h=a30dc254c2406077eea5bd89deb999c7d2fd97f6;hb=2340ed6b79b3410e0f885135eaca91f4c15a94a6;hp=930f6efec3e9dcefadf56a64f544cf9da9099cb5;hpb=edf82675e427f6cb749f8e3802c7d8879b883b6e;p=packages%2Fzabbix.git

diff --git a/zabbix.spec b/zabbix.spec
index 930f6ef..a30dc25 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -10,16 +10,18 @@
 %define databases %{?with_sqlite3:sqlite3} %{?with_pgsql:postgresql} %{?with_mysql:mysql}
 %define any_database %{with pgsql}%{with mysql}%{with sqlite3}
 
+%define		_noautoreq 'pear(.*\.php)'
+
 %define		php_min_version 5.4.0
 Summary:	Zabbix - network monitoring software
 Summary(pl.UTF-8):	Zabbix - oprogramowanie do monitorowania sieci
 Name:		zabbix
-Version:	5.0.7
-Release:	0.1
+Version:	6.0.13
+Release:	3
 License:	GPL v2+
 Group:		Networking/Utilities
-Source0:	https://cdn.zabbix.com/zabbix/sources/stable/5.0/%{name}-%{version}.tar.gz
-# Source0-md5:	e0798bb1b53ab7b451556dc34c3b1827
+Source0:	https://cdn.zabbix.com/zabbix/sources/stable/6.0/%{name}-%{version}.tar.gz
+# Source0-md5:	90397f76b04d1ffc3ca6b0c4f9fd8d60
 Source1:	%{name}-apache.conf
 Source2:	%{name}_agentd.init
 Source3:	%{name}_server.init
@@ -388,6 +390,7 @@ if [ "$1" = 1 ]; then
 	You should create database for Zabbix.
 
 	Running these should be fine in most cases:
+
 	mysqladmin create zabbix
 	zcat %{_docdir}/%{name}-server-mysql-%{version}/schema.sql.gz | mysql zabbix
 	zcat %{_docdir}/%{name}-server-mysql-%{version}/images.sql.gz | mysql zabbix
@@ -403,16 +406,24 @@ if [ "$1" = 1 ]; then
 
 	Running these should be fine in most cases:
 
-	createuser zabbix
-	createdb -O zabbix zabbix
-	zcat %{_docdir}/%{name}-server-postgresql-%{version}/schema.sql.gz | psql -u zabbix zabbix
-	zcat %{_docdir}/%{name}-server-postgresql-%{version}/images.sql.gz | psql -u zabbix zabbix
-	zcat %{_docdir}/%{name}-server-postgresql-%{version}/data.sql.gz | psql -u zabbix zabbix
+	createuser -U postgres zabbix
+	createdb -U postgres -O zabbix zabbix
+	zcat %{_docdir}/%{name}-server-postgresql-%{version}/schema.sql.gz | psql -U zabbix zabbix
+	zcat %{_docdir}/%{name}-server-postgresql-%{version}/images.sql.gz | psql -U zabbix zabbix
+	zcat %{_docdir}/%{name}-server-postgresql-%{version}/data.sql.gz | psql -U zabbix zabbix
 EOF
 fi
 ln -sf %{_sbindir}/zabbix_server-postgresql %{_sbindir}/zabbix_server || :
 
+%post server
+/sbin/chkconfig --add zabbix_server
+%service zabbix_server restart
+
 %postun server
+if [ "$1" = "0" ]; then
+	%service -q zabbix_server stop
+	/sbin/chkconfig --del zabbix_server
+fi
 if [ "$1" = "0" ]; then
 	if [ -L %{_sbindir}/zabbix_server ] ; then
 		rm -f %{_sbindir}/zabbix_server || :
@@ -438,6 +449,21 @@ ln -sf %{_sbindir}/zabbix_proxy-postgresql %{_sbindir}/zabbix_proxy || :
 %post proxy-sqlite3
 ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
 
+%post proxy
+/sbin/chkconfig --add zabbix_server
+%service zabbix_server restart
+
+%postun proxy
+if [ "$1" = "0" ]; then
+	%service -q zabbix_proxy stop
+	/sbin/chkconfig --del zabbix_proxy
+fi
+if [ "$1" = "0" ]; then
+	if [ -L %{_sbindir}/zabbix_proxy ] ; then
+		rm -f %{_sbindir}/zabbix_proxy || :
+	fi
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README