X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=zabbix.spec;h=2f4fe8c36ccbd660faf41401cc5e4e4cc5a9c9e3;hb=HEAD;hp=1adc9a5a02a8f0d7970131263b48cc9a1c190c4d;hpb=96ef8ffbef5ee8a1c610fabea058c6accd925618;p=packages%2Fzabbix.git

diff --git a/zabbix.spec b/zabbix.spec
index 1adc9a5..2f4fe8c 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -24,12 +24,12 @@
 Summary:	Zabbix - network monitoring software
 Summary(pl.UTF-8):	Zabbix - oprogramowanie do monitorowania sieci
 Name:		zabbix
-Version:	6.0.25
+Version:	6.0.29
 Release:	1
 License:	GPL v2+
 Group:		Networking/Utilities
 Source0:	https://cdn.zabbix.com/zabbix/sources/stable/6.0/%{name}-%{version}.tar.gz
-# Source0-md5:	510cb7207048414b71b4fecc9aa50b6b
+# Source0-md5:	73314d5d61722baf9236a4755f07a100
 Source1:	%{name}-apache.conf
 Source2:	%{name}_agentd.init
 Source3:	%{name}_server.init
@@ -137,10 +137,12 @@ Group:		Applications/WWW
 Requires:	php(bcmath)
 Requires:	php(core) >= %{php_min_version}
 Requires:	php(ctype)
+Requires:	php(filter)
 Requires:	php(gd)
 Requires:	php(gettext)
 Requires:	php(json)
 Requires:	php(mbstring)
+Requires:	php(openssl)
 Requires:	php(pcre)
 Requires:	php(session)
 Requires:	php(sockets)
@@ -342,7 +344,7 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig},/etc/webapps/%{_webapp},%{_appdir}} \
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/zabbix_agent2.conf.d,/etc/{rc.d/init.d,sysconfig},/etc/webapps/%{_webapp},%{_appdir}} \
 	$RPM_BUILD_ROOT{/var/run/zabbix,/var/log/zabbix}
 
 %{__make} install \
@@ -427,9 +429,9 @@ if [ "$1" = 1 ]; then
 	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
-	zcat %{_docdir}/%{name}-server-mysql-%{version}/data.sql.gz | mysql zabbix
+	cat %{_docdir}/%{name}-server-mysql-%{version}/schema.sql | mysql zabbix
+	cat %{_docdir}/%{name}-server-mysql-%{version}/images.sql | mysql zabbix
+	cat %{_docdir}/%{name}-server-mysql-%{version}/data.sql | mysql zabbix
 EOF
 fi
 ln -sf %{_sbindir}/zabbix_server-mysql %{_sbindir}/zabbix_server || :
@@ -443,9 +445,9 @@ if [ "$1" = 1 ]; then
 
 	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
+	cat %{_docdir}/%{name}-server-postgresql-%{version}/schema.sql | psql -U zabbix zabbix
+	cat %{_docdir}/%{name}-server-postgresql-%{version}/images.sql | psql -U zabbix zabbix
+	cat %{_docdir}/%{name}-server-postgresql-%{version}/data.sql | psql -U zabbix zabbix
 EOF
 fi
 ln -sf %{_sbindir}/zabbix_server-postgresql %{_sbindir}/zabbix_server || :
@@ -538,6 +540,7 @@ fi
 %attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.conf
 %dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_agent2.d
 %dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_agent2.d/plugins.d
+%dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_agent2.conf.d
 %attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/ceph.conf
 %attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/docker.conf
 %attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/memcached.conf