@cryptotaxi247 / netdata-1 / commits / ff22487f2

netdata/packaging: Split CUPS plugin to separate package (RPM) (#6700)

* netdata/packaging: introduce cups subpackage on RPM named netdata-plugin-cups * netdata/packaging:[ci skip] use the dev branch to test * netdata/packaging: [ci skip] temporary workaround for build-id error during go.d plugin set up * netdata/packaging: re-arrange package dependencies * netdata/packaging: use a global version variable and make sure cups will depend on the specific version of netdata, we tightly pair them * netdata/packaging: not sure, i guess this is also needed during build [ci skip] * netdata/packaging: always use netdata packagecloud account and just switch to -devel when repo slug is paulkatsoulakis/netdata * Revert "netdata/packaging: not sure, i guess this is also needed during build [ci skip]" This reverts commit 474333e8c41daa759636afa3eda2a098fcee8463. * netdata/packaging: [ci skip] add cups package also * Revert "netdata/packaging: [ci skip] add cups package also" This reverts commit 3914d7000d28623daa93c4a799cee5bc17e624a1. * netdata/packaging: add changelog, dont run the install section for cups * netdata/packaging: explicitly exclude cups from main package * netdata/packaging: [ci skip] adjust perms, we used to have 0750 for cups * netdata/packaging: [ci skip] reinstate master branch in travis * netdata/packaging: another miss from the merge * netdata/packaging: correlate with the other branch [ci skip] * netdata/packaging: dont use personal account info

Paul Emm. Katsoulakis committed Sep 16, 2019 at 11:53 UTC ff22487f28caedeb0694ff595a1afd14ce10f362
1 file changed +24 -3
netdata.spec.in
+24 -3
@@ -1,6 +1,6 @@
1 # SPDX-License-Identifier: GPL-3.0-or-later
2 %global contentdir %{_datadir}/netdata
3 -
3 +%global version @PACKAGE_VERSION@
4
5 #TODO: Temporary fix for the build-id error during go.d plugin set up
6 %global _missing_build_ids_terminate_build 0
@@ -83,7 +83,7 @@ fi \
83
84 Summary: Real-time performance monitoring, done right!
85 Name: netdata
86 -Version: @PACKAGE_VERSION@
86 +Version: %{version}
87 Release: 1%{?dist}
88 License: GPLv3+
89 Group: Applications/System
@@ -193,7 +193,6 @@ Requires: freeipmi
193
194 # CUPS plugin dependencies
195 BuildRequires: cups-devel
196 -Requires: cups
196 # end - cups plugin dependencies
197
198 # Prometheus remote write dependencies
@@ -276,6 +275,11 @@ install -m 4750 -p apps.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.
275 # Install perf.plugin
276 install -m 4750 -p perf.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/perf.plugin"
277
278 +# ###########################################################
279 +# Install cups.plugin
280 +install -m 0750 -p cups.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/cups.plugin"
281 +
282 +
283 # ###########################################################
284 # Install registry directory
285 install -m 755 -d "${RPM_BUILD_ROOT}%{_localstatedir}/lib/%{name}/registry"
@@ -483,8 +487,25 @@ rm -rf "${RPM_BUILD_ROOT}"
487 %attr(0770,netdata,netdata) %dir %{_localstatedir}/lib/%{name}
488 %attr(0770,netdata,netdata) %dir %{_localstatedir}/lib/%{name}/registry
489
490 +# CUPS belongs to a different sub package
491 +%exclude %{_libexecdir}/%{name}/plugins.d/cups.plugin
492 +
493 +%package plugin-cups
494 +Summary: The Common Unix Printing System plugin for netdata
495 +Group: Applications/System
496 +Requires: cups
497 +Requires: netdata = %{version}
498 +
499 +%description plugin-cups
500 + This is the Common Unix Printing System plugin for the netdata daemon.
501 +Use this plugin to enable metrics collection from cupsd, the daemon running when CUPS is enabled on the system
502 +
503 +%files plugin-cups
504 +%attr(0750,root,netdata) %{_libexecdir}/%{name}/plugins.d/cups.plugin
505
506 %changelog
507 +* Tue Aug 20 2019 Pavlos Emm. Katsoulakis <paul@netdat.acloud> - 0.0.0-8
508 +- Split CUPS functionality on separate package
509 * Fri Jun 28 2019 Pavlos Emm. Katsoulakis <paul@netdata.cloud> - 0.0.0-7
510 - Raise the path overrides to the spec file level, not just the configure.
511 - Adjust tighter permissions on some folders, based on what we did on our installer