diff options
Diffstat (limited to '')
| -rw-r--r-- | netdata.spec.in | 42 |
1 files changed, 38 insertions, 4 deletions
diff --git a/netdata.spec.in b/netdata.spec.in index 217e79c35..edf6a6c36 100644 --- a/netdata.spec.in +++ b/netdata.spec.in @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later %global contentdir %{_datadir}/netdata - +%global version @PACKAGE_VERSION@ #TODO: Temporary fix for the build-id error during go.d plugin set up %global _missing_build_ids_terminate_build 0 @@ -83,7 +83,7 @@ fi \ Summary: Real-time performance monitoring, done right! Name: netdata -Version: @PACKAGE_VERSION@ +Version: %{version} Release: 1%{?dist} License: GPLv3+ Group: Applications/System @@ -192,8 +192,9 @@ Requires: freeipmi # end - freeipmi plugin dependencies # CUPS plugin dependencies -BuildRequires: cups-devel -Requires: cups +%if 0%{?centos_ver} != 6 && 0%{?centos_ver} != 7 +BuildRequires: cups-devel >= 1.7 +%endif # end - cups plugin dependencies # Prometheus remote write dependencies @@ -277,6 +278,16 @@ install -m 4750 -p apps.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins. install -m 4750 -p perf.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/perf.plugin" # ########################################################### +# Install cups.plugin +%if 0%{?centos_ver} != 6 && 0%{?centos_ver} != 7 +install -m 0750 -p cups.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/cups.plugin" +%endif + +# ########################################################### +# Install slabinfo.plugin +install -m 4750 -p slabinfo.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/slabinfo.plugin" + +# ########################################################### # Install registry directory install -m 755 -d "${RPM_BUILD_ROOT}%{_localstatedir}/lib/%{name}/registry" install -m 755 -d "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/custom-plugins.d" @@ -447,6 +458,8 @@ rm -rf "${RPM_BUILD_ROOT}" # perf plugin %caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/perf.plugin +# perf plugin +%caps(cap_setuid=ep) %attr(4550,root,netdata) %{_libexecdir}/%{name}/plugins.d/slabinfo.plugin # freeipmi files %caps(cap_setuid=ep) %attr(4550,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin @@ -483,8 +496,29 @@ rm -rf "${RPM_BUILD_ROOT}" %attr(0770,netdata,netdata) %dir %{_localstatedir}/lib/%{name} %attr(0770,netdata,netdata) %dir %{_localstatedir}/lib/%{name}/registry +# CUPS belongs to a different sub package +%if 0%{?centos_ver} != 6 && 0%{?centos_ver} != 7 +%exclude %{_libexecdir}/%{name}/plugins.d/cups.plugin + +%package plugin-cups +Summary: The Common Unix Printing System plugin for netdata +Group: Applications/System +Requires: cups >= 1.7 +Requires: netdata = %{version} + +%description plugin-cups + This is the Common Unix Printing System plugin for the netdata daemon. +Use this plugin to enable metrics collection from cupsd, the daemon running when CUPS is enabled on the system + +%files plugin-cups +%attr(0750,root,netdata) %{_libexecdir}/%{name}/plugins.d/cups.plugin +%endif %changelog +* Mon Sep 23 2019 Konstantinos Natsakis <konstantinos.natsakis@gmail.com> 0.0.0-9 +- Do not build CUPS plugin subpackage on CentOS 6 and CentOS 7 +* Tue Aug 20 2019 Pavlos Emm. Katsoulakis <paul@netdat.acloud> - 0.0.0-8 +- Split CUPS functionality on separate package * Fri Jun 28 2019 Pavlos Emm. Katsoulakis <paul@netdata.cloud> - 0.0.0-7 - Raise the path overrides to the spec file level, not just the configure. - Adjust tighter permissions on some folders, based on what we did on our installer |