- updated to 1.8.0

- updated nodejs patch
- added freeipmi bcond

diff --git a/netdata.spec b/netdata.spec
index 8fede1a7c714e36178ff7bc23f990a20d88ac037..2ae9629e31b84bc5ffcb5fc68971c31e9418fab1 100644 (file)
--- a/netdata.spec
+++ b/netdata.spec
@@ -1,24 +1,26 @@
 #
 # Conditional build:
-%bcond_without nfacct          # build with nfacct plugin
+%bcond_without freeipmi        # freeipmi plugin
+%bcond_without nfacct          # nfacct plugin
 
 Summary:       Linux real time performance monitoring
 Summary(pl.UTF-8):     Monitorowanie wydajności Linuksa w czasie rzeczywistym
 Name:          netdata
-Version:       1.6.0
+Version:       1.8.0
 Release:       1
 License:       GPL v3+
 Group:         Applications/System
 #Source0Download: https://github.com/firehol/netdata/releases
 Source0:       https://github.com/firehol/netdata/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 7a33f146702ebb29cc9518b33ec911a0
+# Source0-md5: 4058c3acdda1af5968e7dc636ba322e2
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Patch0:                nodejs.patch
 URL:           http://netdata.firehol.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.60
 BuildRequires: automake
-BuildRequires: freeipmi-devel
+%{?with_freeipmi:BuildRequires:        freeipmi-devel}
+BuildRequires: libcap-devel
 %{?with_nfacct:BuildRequires:  libmnl-devel}
 %{?with_nfacct:BuildRequires:  libnetfilter_acct-devel}
 BuildRequires: libuuid-devel
@@ -145,9 +147,10 @@ Wtyczki Pythona dla netdata.
 %{__automake}
 %configure \
        --libdir=%{_libexecdir} \
-       --with-zlib \
-       --with-math \
+       %{__enable_disable freeipmi plugin-freeipmi} \
        %{__enable_disable nfacct plugin-nfacct} \
+       --with-math \
+       --with-zlib \
        --with-user=netdata
 %{__make}
 
@@ -192,6 +195,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
+%doc ChangeLog LICENSE.md LICENSE-REDISTRIBUTED.md README.md
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/apps_groups.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/netdata.conf
@@ -255,3 +259,4 @@ fi
 %{_libexecdir}/%{name}/python.d/python_modules/*.py
 %{_libexecdir}/%{name}/python.d/python_modules/pyyaml2
 %{_libexecdir}/%{name}/python.d/python_modules/pyyaml3
+%{_libexecdir}/%{name}/python.d/python_modules/urllib3

diff --git a/nodejs.patch b/nodejs.patch
index a2f6ae12293a671901155b09ba52ee4cae6efe43..340f35cb9f0be3b26384422f638e9ece571214c5 100644 (file)
--- a/nodejs.patch
+++ b/nodejs.patch
@@ -1,5 +1,5 @@
---- netdata-1.6.0/plugins.d/node.d.plugin.orig 2017-04-17 17:56:37.618423579 +0200
-+++ netdata-1.6.0/plugins.d/node.d.plugin      2017-04-17 17:57:47.213302270 +0200
+--- netdata-1.8.0/plugins.d/node.d.plugin.orig 2017-12-02 09:30:52.141653204 +0100
++++ netdata-1.8.0/plugins.d/node.d.plugin      2017-12-02 09:36:15.688316178 +0100
 @@ -1,12 +1,5 @@
 -#!/usr/bin/env bash
 -':' //; exec "$(command -v nodejs || command -v node || command -v js || echo "ERROR node.js IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@"
@@ -7,7 +7,7 @@
 -// shebang hack from:
 -// http://unix.stackexchange.com/questions/65235/universal-node-js-shebang
 -
--// Initially this is run as a shell script (#!/bin/sh).
+-// Initially this is run as a shell script.
 -// Then, the second line, finds nodejs or node or js in the system path
 -// and executes it with the shell parameters.
 +#!/usr/bin/node