spec: merge apps.plugin

reorder so that caps will take affect as
apps.plugin appears twice (libexec + explicit)

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

diff --git a/netdata.spec.in b/netdata.spec.in
index 9bf6f5b1f6b05e13c8f778e21c971f7213319556..85e05ba7eff3d0b13dc3f2b19e7257842049b91a 100644 (file)
--- a/netdata.spec.in
+++ b/netdata.spec.in
@@ -133,7 +133,6 @@ install -m 755 system/netdata-init-d \
 
 %post
 %distro_post
-setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/libexec/netdata/plugins.d/apps.plugin || chmod 1755 /usr/libexec/netdata/plugins.d/apps.plugin
 
 %preun
 %distro_preun
@@ -151,7 +150,6 @@ getent passwd netdata >/dev/null || \
 exit 0
 
 %post
-setcap cap_dac_read,cap_sys_ptrace+ep /usr/libexec/netdata/plugins.d/apps.plugin || chmod 1755 /usr/libexec/netdata/plugins.d/apps.plugin
 # Register the netdata service
 /sbin/chkconfig --add netdata
 # Only gets run on initial install (not upgrades or uninstalls)
@@ -195,12 +193,11 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 # To be eventually moved to %%_defaultdocdir
 %{_sysconfdir}/%{name}/node.d/*.md
-
-%caps(cap_dac_read_search,cap_sys_ptrace=ep) %{_libexecdir}/%{name}/plugins.d/apps.plugin
-
 %{_libexecdir}/%{name}
 %{_sbindir}/%{name}
 
+%caps(cap_dac_read_search,cap_sys_ptrace=ep) %attr(0555,root,root) %{_libexecdir}/%{name}/plugins.d/apps.plugin
+
 %attr(0700,netdata,netdata) %dir %{_localstatedir}/cache/%{name}
 %attr(0700,netdata,netdata) %dir %{_localstatedir}/log/%{name}
 %attr(0700,netdata,netdata) %dir %{_localstatedir}/lib/%{name}