[zabbix20/el6] Solve conflict between proxy, server and base package

[Volker Fröhlich]

commit 6afe7903ccc738fae7e9aa04d5f2843cbe565daa
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Tue Jan 22 11:31:05 2013 +0100

    Solve conflict between proxy, server and base package
    
    - Remove zabbix_get plus manpage from the proxy files section
    - Solve conflict for externalscripts symlink between proxy and
      server package

 zabbix20.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/zabbix20.spec b/zabbix20.spec
index 3fa01c4..b0bed59 100644
--- a/zabbix20.spec
+++ b/zabbix20.spec
@@ -834,7 +834,7 @@ fi
 %endif
 %attr(0600,zabbixsrv,zabbix) %config(noreplace) %{_sysconfdir}/zabbix_proxy.conf
 %config(noreplace) %{_sysconfdir}/%{srcname}/zabbix_proxy.conf
-%attr(0755,zabbixsrv,zabbix) %dir %{_sysconfdir}/%{srcname}/externalscripts
+%config(noreplace) %{_sysconfdir}/%{srcname}/externalscripts
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy
 %ghost %{_sbindir}/zabbix_proxy
 %attr(0755,zabbixsrv,zabbix) %{_sharedstatedir}/%{srcname}srv
@@ -843,8 +843,6 @@ fi
 %else
 %{_initrddir}/zabbix-proxy
 %endif
-%{_bindir}/zabbix_get
-%{_mandir}/man1/zabbix_get.1*
 %{_mandir}/man8/zabbix_proxy.8*
 
 %files proxy-mysql
@@ -880,6 +878,11 @@ fi
 %files web-pgsql
 
 %changelog
+* Tue Jan 22 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.4-4
+- Remove zabbix_get plus manpage from the proxy files section
+- Solve conflict for externalscripts symlink between proxy and
+  server package
+
 * Thu Jan 17 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.4-3
 - Patch for CVE-2013-1364