projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectd.spec: avoid accidentally picking an ancient/unsupported java version
[collectd.git]
/
contrib
/
redhat
/
collectd.spec
diff --git
a/contrib/redhat/collectd.spec
b/contrib/redhat/collectd.spec
index
7dab1db
..
a51c570
100644
(file)
--- a/
contrib/redhat/collectd.spec
+++ b/
contrib/redhat/collectd.spec
@@
-230,7
+230,7
@@
Summary: Statistics collection and monitoring daemon
Name: collectd
Version: 5.6.1
Summary: Statistics collection and monitoring daemon
Name: collectd
Version: 5.6.1
-Release:
2
%{?dist}
+Release:
4
%{?dist}
URL: https://collectd.org
Source: https://collectd.org/files/%{name}-%{version}.tar.bz2
License: GPLv2
URL: https://collectd.org
Source: https://collectd.org/files/%{name}-%{version}.tar.bz2
License: GPLv2
@@
-240,6
+240,7
@@
BuildRequires: libgcrypt-devel, kernel-headers, libtool-ltdl-devel, libcap-devel
Vendor: collectd development team <collectd@verplant.org>
%if 0%{?fedora} || 0%{?rhel} >= 7
Vendor: collectd development team <collectd@verplant.org>
%if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires: xfsprogs-devel
%{?systemd_requires}
BuildRequires: systemd
%else
%{?systemd_requires}
BuildRequires: systemd
%else
@@
-482,8
+483,8
@@
the byte- and packet-counters of selected rules and submit them to collectd.
Summary: Java plugin for collectd
Group: System Environment/Daemons
Requires: %{name}%{?_isa} = %{version}-%{release}
Summary: Java plugin for collectd
Group: System Environment/Daemons
Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: java-devel
, jpackage-utils
-Requires: java
, jpackage-utils
+BuildRequires: java-devel
>= 1.6, jpackage-utils >= 1.6
+Requires: java
>= 1.6, jpackage-utils >= 1.6
%description java
This plugin for collectd allows plugins to be written in Java and executed
in an embedded JVM.
%description java
This plugin for collectd allows plugins to be written in Java and executed
in an embedded JVM.
@@
-830,7
+831,7
@@
The Write Redis plugin stores values in Redis, a “data structures server”.
Summary: riemann plugin for collectd
Group: System Environment/Daemons
Requires: %{name}%{?_isa} = %{version}-%{release}
Summary: riemann plugin for collectd
Group: System Environment/Daemons
Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires:
protobuf-c-devel
+BuildRequires:
riemann-c-client-devel >= 1.6
%description write_riemann
The riemann plugin submits values to Riemann, an event stream processor.
%endif
%description write_riemann
The riemann plugin submits values to Riemann, an event stream processor.
%endif
@@
-2515,6
+2516,12
@@
fi
%doc contrib/
%changelog
%doc contrib/
%changelog
+* Sun Mar 05 2017 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.6.1-4
+- Don't enable XFS support on RHEL6, it is missing for i386
+
+* Wed Feb 22 2017 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.6.1-3
+- Enable XFS support in df plugin
+
* Tue Nov 29 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.6.1-2
- Disable redis plugin on RHEL < 7, hiredis has been retired from EPEL6
* Tue Nov 29 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.6.1-2
- Disable redis plugin on RHEL < 7, hiredis has been retired from EPEL6