Last active
August 29, 2015 14:01
-
-
Save setou/84235cb897f5e2a936ec to your computer and use it in GitHub Desktop.
zabbix 2.2.3 amzn patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
*** zabbix.spec.20140508 2014-04-08 15:37:13.000000000 +0000 | |
--- zabbix.spec 2014-05-09 07:58:24.957174877 +0000 | |
*************** | |
*** 27,40 **** | |
%if %{build_server} | |
BuildRequires : mysql-devel | |
BuildRequires : postgresql-devel | |
- BuildRequires : net-snmp-devel | |
BuildRequires : openldap-devel | |
BuildRequires : gnutls-devel | |
BuildRequires : iksemel-devel | |
BuildRequires : sqlite-devel | |
BuildRequires : unixODBC-devel | |
BuildRequires : curl-devel >= 7.13.1 | |
- BuildRequires : OpenIPMI-devel >= 2 | |
BuildRequires : libssh2-devel >= 1 | |
BuildRequires : java-devel >= 1.6.0 | |
BuildRequires : libxml2-devel | |
--- 27,38 ---- | |
*************** | |
*** 93,104 **** | |
Requires : zabbix = %{version}-%{release} | |
Requires : zabbix-server-implementation = %{version}-%{release} | |
Requires : fping | |
- Requires : net-snmp | |
Requires : iksemel | |
Requires : unixODBC | |
Requires : libssh2 >= 1.0.0 | |
Requires : curl >= 7.13.1 | |
- Requires : OpenIPMI-libs >= 2.0.14 | |
Requires(post) : /sbin/chkconfig | |
Requires(preun) : /sbin/chkconfig | |
Requires(preun) : /sbin/service | |
--- 91,100 ---- | |
*************** | |
*** 136,146 **** | |
Requires : zabbix = %{version}-%{release} | |
Requires : zabbix-proxy-implementation = %{version}-%{release} | |
Requires : fping | |
- Requires : net-snmp | |
Requires : unixODBC | |
Requires : libssh2 >= 1.0.0 | |
Requires : curl >= 7.13.1 | |
- Requires : OpenIPMI-libs >= 2.0.14 | |
Conflicts : zabbix-server | |
Conflicts : zabbix-web | |
Requires(post) : /sbin/chkconfig | |
--- 132,140 ---- | |
*************** | |
*** 263,274 **** | |
%package web-japanese | |
Summary : Japanese font for Zabbix web frontend | |
Group : Applications/Internet | |
- %if 0%{?fedora} > 9 || 0%{?rhel} >= 6 | |
BuildArch : noarch | |
Requires : vlgothic-p-fonts | |
- %else | |
- Requires : ipa-pgothic-fonts | |
- %endif | |
Requires : %{name}-web = %{version}-%{release} | |
Requires(post) : %{_sbindir}/update-alternatives | |
Requires(preun) : %{_sbindir}/update-alternatives | |
--- 257,264 ---- | |
*************** | |
*** 337,349 **** | |
--enable-server | |
--enable-agent | |
--enable-proxy | |
- --enable-ipv6 | |
--enable-java | |
- --with-net-snmp | |
--with-ldap | |
--with-libcurl | |
- --with-openipmi | |
- --with-jabber | |
--with-unixodbc | |
--with-ssh2 | |
--with-libxml2 | |
--- 327,335 ---- | |
*************** | |
*** 589,599 **** | |
: | |
%post web-japanese | |
! %if 0%{?fedora} || 0%{?rhel} >= 6 | |
! /usr/sbin/update-alternatives --install %{_datadir}/%{name}/fonts/graphfont.ttf zabbix-web-font %{_datadir}/fonts/vlgothic/VL-PGothic-Regular.ttf 20 | |
! %else | |
! /usr/sbin/update-alternatives --install %{_datadir}/%{name}/fonts/graphfont.ttf zabbix-web-font %{_datadir}/fonts/ipa-pgothic/ipagp.ttf 20 | |
! %endif | |
: | |
%endif | |
--- 575,581 ---- | |
: | |
%post web-japanese | |
! /usr/sbin/update-alternatives --install %{_datadir}/%{name}/fonts/graphfont.ttf zabbix-web-font %{_datadir}/fonts/vlgothic/VL-PGothic-Regular.ttf 20 | |
: | |
%endif | |
*************** | |
*** 679,689 **** | |
%preun web-japanese | |
if [ "$1" = 0 ] | |
then | |
! %if 0%{?fedora} || 0%{?rhel} >= 6 | |
! /usr/sbin/update-alternatives --remove zabbix-web-font %{_datadir}/fonts/vlgothic/VL-PGothic-Regular.ttf | |
! %else | |
! /usr/sbin/update-alternatives --remove zabbix-web-font %{_datadir}/fonts/ipa-pgothic/ipagp.ttf | |
! %endif | |
fi | |
: | |
%endif | |
--- 661,667 ---- | |
%preun web-japanese | |
if [ "$1" = 0 ] | |
then | |
! /usr/sbin/update-alternatives --remove zabbix-web-font %{_datadir}/fonts/vlgothic/VL-PGothic-Regular.ttf | |
fi | |
: | |
%endif |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment