summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben Kerkhof <ruben@rubenkerkhof.com>2013-12-23 11:17:33 +0100
committerRuben Kerkhof <ruben@rubenkerkhof.com>2013-12-23 11:17:33 +0100
commit608ebc5839f810e55f02b87ca6270cf4346da552 (patch)
tree0ca076edd532fc5d2290e1e5762e8cfdf363ff0e
parent26fb8d0f019a8e345eed5a0806f28bc84b1e1732 (diff)
downloadcollectd-f20.tar.gz
collectd-f20.tar.xz
collectd-f20.zip
Upstream released new versionf20f19
- Enable memcached plugin (#1036422) - Stop running autoreconf
-rw-r--r--.gitignore1
-rw-r--r--collectd.spec18
-rw-r--r--sources2
3 files changed, 9 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 4ef59cf..e6a073f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/collectd-5.2.2.tar.bz2
/collectd-5.3.0.tar.bz2
+/collectd-5.3.1.tar.bz2
diff --git a/collectd.spec b/collectd.spec
index 4ac15dc..c8e1e43 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,8 +3,8 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
-Version: 5.3.0
-Release: 5%{?dist}
+Version: 5.3.1
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://collectd.org/
@@ -27,7 +27,6 @@ BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(ExtUtils::Embed)
BuildRequires: python-devel
BuildRequires: libgcrypt-devel
-BuildRequires: autoconf, automake
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@@ -190,7 +189,6 @@ BuildRequires: jpackage-utils
These are the Java bindings for collectd.
-%if 0%{?fedora} <= 18
%package memcachec
Summary: Memcachec plugin for collectd
Group: System Environment/Daemons
@@ -199,7 +197,6 @@ BuildRequires: libmemcached-devel
%description memcachec
This plugin connects to a memcached server, queries one or more
given pages and parses the returned data according to user specification.
-%endif
%package modbus
@@ -403,7 +400,6 @@ It graphs the bit-rate and sampling rate as you play songs.
# update for aarch64
%setup -q
%patch0 -p1
-autoreconf --force
sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
@@ -415,9 +411,6 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
--disable-apple_sensors \
--disable-lpar \
--disable-netapp \
-%if 0%{?fedora} >= 19
- --disable-memcachec \
-%endif
%ifarch s390 s390x
--disable-nut \
%endif
@@ -705,10 +698,8 @@ rm -f %{buildroot}/%{_libdir}/{collectd/,}*.la
%{_datadir}/collectd/java/collectd-api.jar
%doc %{_mandir}/man5/collectd-java.5*
-%if 0%{?fedora} <= 18
%files memcachec
%{_libdir}/collectd/memcachec.so
-%endif
%files modbus
@@ -817,6 +808,11 @@ rm -f %{buildroot}/%{_libdir}/{collectd/,}*.la
%changelog
+* Mon Dec 23 2013 Ruben Kerkhof <ruben@rubenkerkhof.com> 5.3.1-1
+- Upstream released new version
+- Enable memcached plugin (#1036422)
+- Stop running autoreconf
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 86672d1..2555627 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f0eb7b27ada94b22ed881daf788958b collectd-5.3.0.tar.bz2
+7cd518c58271a9a8160f7ec8a607b3c5 collectd-5.3.1.tar.bz2