diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-02-03 07:30:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 07:30:13 -0500 |
| commit | 31675045e99975fc2599d13b92a93269e7983743 (patch) | |
| tree | 33808ff08d235a649fe9ad0e7956d283f22ba32f /netdata.spec.in | |
| parent | 3522e0720cc18d402da7ca0891316494ec6b98cb (diff) | |
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.
Diffstat (limited to 'netdata.spec.in')
| -rw-r--r-- | netdata.spec.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/netdata.spec.in b/netdata.spec.in index 5cfe42b192..0e59a93d41 100644 --- a/netdata.spec.in +++ b/netdata.spec.in @@ -99,7 +99,7 @@ URL: http://my-netdata.io BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: make -BuildRequires: git +BuildRequires: git-core BuildRequires: autoconf %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1140 BuildRequires: autoconf-archive @@ -116,12 +116,10 @@ BuildRequires: openssl-devel %if 0%{?suse_version} BuildRequires: judy-devel BuildRequires: liblz4-devel -BuildRequires: netcat-openbsd BuildRequires: json-glib-devel %else BuildRequires: Judy-devel BuildRequires: lz4-devel -BuildRequires: nc BuildRequires: json-c-devel %endif @@ -285,6 +283,11 @@ install -m 0750 -p cups.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins. install -m 4750 -p slabinfo.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/slabinfo.plugin" # ########################################################### +# Install cache and log directories +install -m 755 -d "${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}" +install -m 755 -d "${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}" + +# ########################################################### # Install registry directory 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 %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin %changelog +* Thu Jan 01 2020 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-12 +- Add explicit installation of log and cache directories +- Clean up build dependencies. * Thu Dec 19 2019 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-11 - Fix remaining ownership and permissions issues. * Mon Nov 04 2019 Konstantinos Natsakis <konstantinos.natsakis@gmail.com> 0.0.0-10 |