diff --git a/SPECS/zabbix.spec b/SPECS/zabbix.spec index 765d964..b4bbce4 100644 --- a/SPECS/zabbix.spec +++ b/SPECS/zabbix.spec @@ -1,6 +1,6 @@ Name: zabbix Version: 6.0.12 -Release: %{?alphatag:%{?alphatag}.}release1%{?dist} +Release: %{?alphatag:%{?alphatag}.}1%{?dist} Summary: The Enterprise-class open source monitoring solution Group: Applications/Internet License: GPLv2+ @@ -43,7 +43,7 @@ Buildroot: %{_tmppath}/zabbix-%{version}-%{release}-root-%(%{__id_u} -n) %ifarch x86_64 %if 0%{?rhel} >= 6 -%{!?build_agent2: %global build_agent2 1} +%{!?build_agent2: %global build_agent2 0} %endif %if 0%{?rhel} >= 8 %{!?build_web_service: %global build_web_service 1} @@ -89,25 +89,31 @@ Buildroot: %{_tmppath}/zabbix-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: make %if 0%{?rhel} >= 8 +BuildRequires: libssh-devel >= 0.9.0 BuildRequires: mariadb-connector-c-devel BuildRequires: postgresql-devel >= 12.0 -BuildRequires: sqlite-devel -BuildRequires: net-snmp-devel -BuildRequires: openldap-devel -BuildRequires: gnutls-devel -BuildRequires: unixODBC-devel -BuildRequires: curl-devel >= 7.13.1 -BuildRequires: OpenIPMI-devel >= 2 -BuildRequires: libssh-devel >= 0.9.0 -BuildRequires: java-devel >= 1.6.0 -BuildRequires: libxml2-devel -BuildRequires: libevent-devel +BuildRequires: golang golang-bin %endif %if 0%{?rhel} >= 7 +BuildRequires: curl-devel >= 7.13.1 +BuildRequires: libevent-devel +BuildRequires: OpenIPMI-devel >= 2 +BuildRequires: gnutls-devel +BuildRequires: openldap-devel +BuildRequires: unixODBC-devel BuildRequires: pcre2-devel +BuildRequires: sqlite-devel +BuildRequires: net-snmp-devel +BuildRequires: libxml2-devel +BuildRequires: java-devel >= 1.6.0 %else BuildRequires: pcre-devel %endif +%if 0%{?rhel} == 7 +BuildRequires: libssh2-devel +BuildRequires: postgresql-devel +BuildRequires: mariadb-devel +%endif %if 0%{?rhel} >= 6 BuildRequires: openssl-devel >= 1.0.1 %endif @@ -116,6 +122,7 @@ BuildRequires: systemd %endif %if 0%{?build_selinux_policy} BuildRequires: policycoreutils-devel +BuildRequires: selinux-policy-devel %endif %description @@ -1378,6 +1385,10 @@ if [ $1 = 0 ] && semodule -l | grep -q zabbix_policy; then semodule -r zabbix_po %changelog +* Tue Dec 20 2022 Fabian Arrotin - 6.0.12-1 +- Disabled agent2 build (missing go rpm pkgs) +- Fixed BuildRequires to cover el7/el8/el9 diff in one .spec + * Mon Dec 05 2022 Zabbix Packager - 6.0.12-release1 - update to 6.0.12