- fix noautoreq

[packages/zabbix.git] / zabbix.spec

diff --git a/zabbix.spec b/zabbix.spec
index c135908167317f17daf8f7ffab94682845438b41..5997c3cfee17e115073ca6d38879e94b9df6bde7 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -11,7 +11,7 @@
 %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                _noautoreq_pear /etc/zabbix/web/maintenance\.inc\.php include/.*\.php vendor/.*\.php
 
 %define                php_min_version 7.2.5
 
@@ -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.30
 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: 7f553e63c07f330996ad06ea87ea2f38
 Source1:       %{name}-apache.conf
 Source2:       %{name}_agentd.init
 Source3:       %{name}_server.init
@@ -344,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 \
@@ -540,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