Attachment 872452 Details for Bug 1074318 – Fixes the issue

[patch] Fixes the issue

zabbix20.spec.diff (text/plain), 1.18 KB, created by Rolf Fokkens on 2014-03-09 18:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rolf Fokkens

Created: 2014-03-09 18:10:01 UTC

Size: 1.18 KB

patch

obsolete

>--- zabbix20.spec.orig	2014-03-09 18:52:25.051000000 +0100
>+++ zabbix20.spec	2014-03-09 18:57:53.503000000 +0100
>@@ -272,11 +272,6 @@
> %patch3 -p1
> %endif
> 
>-# Logrotate's su option is currently only available in Fedora
>-%if 0%{?rhel}
>-sed -i '/su zabbix zabbix/d' %{SOURCE5}
>-%endif
>-
> # Remove flash applet
> # https://support.zabbix.com/browse/ZBX-4794
> %patch2 -p1
>@@ -433,11 +428,17 @@
> install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{srcname}.conf
> 
> # Install log rotation
>-sed -e 's|COMPONENT|agentd|g' %{SOURCE5} > \
>+# Logrotate's su option is currently only available in Fedora
>+%if 0%{?rhel}
>+sed '/su zabbix zabbix/d' %{SOURCE5} > tmp-zabbix-logrotate
>+%else
>+cp %{SOURCE5} tmp-zabbix-logrotate
>+%endif
>+sed -e 's|COMPONENT|agentd|g' tmp-zabbix-logrotate > \
>      $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent
>-sed -e 's|COMPONENT|server|g' %{SOURCE5} > \
>+sed -e 's|COMPONENT|server|g' tmp-zabbix-logrotate > \
>      $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-server
>-sed -e 's|COMPONENT|proxy|g' %{SOURCE5} > \
>+sed -e 's|COMPONENT|proxy|g'  tmp-zabbix-logrotate > \
>      $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-proxy
> 
> %if 0%{?fedora}

Actions: View | Diff

Attachments on bug 1074318: 872452