@cryptotaxi247 / netdata-1 / commits / 31675045e

Assorted cleanup items in the RPM spec file. (#7927)

* Add explicit creation of log and cache directories to specfile. This eliminates a RPM build error seen on multiple OSes with recent versions of rpmbuild. * Change build dependency for RPMs fron `git` to `git-core`. We don't actually need everything the regular `git` package pulls in, just the `git` command and a handful of built-in sub-commands, so we can just depend on `git-core` during the build instead of the full package. This causes no issues for existing build workflows, as `git` pulls in `git-core`. However, it will allow us to make the new Docker-based package building workflow a bit more efficient as we can decrease the size of the package builder images. * Remove useless build dependency on netcat in specfile. We don't actually use netcat anywhere during the build process, so there's no point in depending on it for the build. * Update RPM specfile changelog.

Austin S. Hemmelgarn committed Feb 3, 2020 at 07:30 UTC 31675045e99975fc2599d13b92a93269e7983743
1 file changed +9 -3
netdata.spec.in
+9 -3
@@ -99,7 +99,7 @@ URL: http://my-netdata.io
99 BuildRequires: gcc
100 BuildRequires: gcc-c++
101 BuildRequires: make
102 -BuildRequires: git
102 +BuildRequires: git-core
103 BuildRequires: autoconf
104 %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1140
105 BuildRequires: autoconf-archive
@@ -116,12 +116,10 @@ BuildRequires: openssl-devel
116 %if 0%{?suse_version}
117 BuildRequires: judy-devel
118 BuildRequires: liblz4-devel
119 -BuildRequires: netcat-openbsd
119 BuildRequires: json-glib-devel
120 %else
121 BuildRequires: Judy-devel
122 BuildRequires: lz4-devel
124 -BuildRequires: nc
123 BuildRequires: json-c-devel
124 %endif
125
@@ -284,6 +282,11 @@ install -m 0750 -p cups.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.
282 # Install slabinfo.plugin
283 install -m 4750 -p slabinfo.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/slabinfo.plugin"
284
285 +# ###########################################################
286 +# Install cache and log directories
287 +install -m 755 -d "${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}"
288 +install -m 755 -d "${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}"
289 +
290 # ###########################################################
291 # Install registry directory
292 install -m 755 -d "${RPM_BUILD_ROOT}%{_localstatedir}/lib/%{name}/registry"
@@ -514,6 +517,9 @@ are sensor monitoring, system event monitoring, power control, and serial-over-L
517 %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin
518
519 %changelog
520 +* Thu Jan 01 2020 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-12
521 +- Add explicit installation of log and cache directories
522 +- Clean up build dependencies.
523 * Thu Dec 19 2019 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-11
524 - Fix remaining ownership and permissions issues.
525 * Mon Nov 04 2019 Konstantinos Natsakis <konstantinos.natsakis@gmail.com> 0.0.0-10