- up to 5.6.1

diff --git a/collectd-modbus.patch b/collectd-modbus.patch
deleted file mode 100644 (file)
index a59fd48..0000000
--- a/collectd-modbus.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- collectd-5.0.2/configure.in.old    2012-03-20 18:44:53.000000000 +0100
-+++ collectd-5.0.2/configure.in        2012-03-20 18:45:54.000000000 +0100
-@@ -2128,7 +2128,7 @@
- if test "x$with_libmodbus" = "xuse_pkgconfig"
- then
-       AC_MSG_NOTICE([Checking for modbus using $PKG_CONFIG])
--      $PKG_CONFIG --exists 'modbus' 2>/dev/null
-+      $PKG_CONFIG --exists 'libmodbus' 2>/dev/null
-       if test $? -ne 0
-       then
-               with_libmodbus="no (pkg-config doesn't know modbus)"
-@@ -2136,12 +2136,12 @@
- fi
- if test "x$with_libmodbus" = "xuse_pkgconfig"
- then
--      with_libmodbus_cflags="`$PKG_CONFIG --cflags 'modbus'`"
-+      with_libmodbus_cflags="`$PKG_CONFIG --cflags 'libmodbus'`"
-       if test $? -ne 0
-       then
-               with_libmodbus="no ($PKG_CONFIG failed)"
-       fi
--      with_libmodbus_libs="`$PKG_CONFIG --libs 'modbus'`"
-+      with_libmodbus_libs="`$PKG_CONFIG --libs 'libmodbus'`"
-       if test $? -ne 0
-       then
-               with_libmodbus="no ($PKG_CONFIG failed)"

diff --git a/collectd.spec b/collectd.spec
index 5a8d67a6373136a36203aab810ab7219457d16f2..a8e880d2680a49a17b653191dc905b5b008b5da5 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -125,12 +125,12 @@
 Summary:       Collects system information in RRD files
 Summary(pl.UTF-8):     Zbieranie informacji o systemie w plikach RRD
 Name:          collectd
-Version:       5.5.0
-Release:       8
+Version:       5.6.1
+Release:       1
 License:       GPL v2
 Group:         Daemons
 Source0:       http://collectd.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5: c39305ef5514b44238b0d31f77e29e6a
+# Source0-md5: 979f43b6439d7df93f0b40c73d779223
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}-http.conf
@@ -141,9 +141,6 @@ Source11:   %{name}-rrdtool.conf
 Patch0:                %{name}-collection.patch
 Patch1:                compile.patch
 Patch2:                noquote.patch
-
-Patch5:                no-Werror.patch
-Patch6:                %{name}-modbus.patch
 URL:           http://collectd.org/
 %{?with_ipmi:BuildRequires:    OpenIPMI-devel >= 2.0.14-3}
 BuildRequires: autoconf
@@ -1322,9 +1319,6 @@ Perl files from Collectd package
 %patch1 -p1
 %patch2 -p1
 
-%patch5 -p1
-#%patch6 -p1
-
 %build
 %{__libtoolize} --ltdl
 %{__aclocal}

diff --git a/no-Werror.patch b/no-Werror.patch
deleted file mode 100644 (file)
index d318828..0000000
--- a/no-Werror.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- collectd-5.4.1/configure.ac~       2014-01-26 09:09:23.000000000 +0100
-+++ collectd-5.4.1/configure.ac        2014-10-04 22:35:37.727704935 +0200
-@@ -589,7 +589,7 @@
- # Emulate behavior of src/Makefile.am
- if test "x$GCC" = "xyes"
- then
--      CFLAGS="$CFLAGS -Wall -Werror"
-+      CFLAGS="$CFLAGS -Wall"
- fi
- 
- AC_CACHE_CHECK([for strtok_r],
-@@ -718,7 +718,7 @@
- if test "x$GCC" = "xyes"
- then
-       SAVE_CFLAGS="$CFLAGS"
--      CFLAGS="$CFLAGS -Wall -Wextra -Werror"
-+      CFLAGS="$CFLAGS -Wall -Wextra"
- fi
- 
- AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"])
-@@ -3205,7 +3205,7 @@
-       SAVE_LDFLAGS="$LDFLAGS"
-       # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
-       # (see issues #41 and #42)
--      CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror"
-+      CFLAGS="$CFLAGS $PERL_CFLAGS -Wall"
-       LIBS="$LIBS $PERL_LIBS"
- 
-       AC_CACHE_CHECK([for broken Perl_load_module()],
---- collectd-5.4.1/src/Makefile.am~    2014-10-04 22:34:10.000000000 +0200
-+++ collectd-5.4.1/src/Makefile.am     2014-10-04 22:36:06.087706122 +0200
-@@ -4,7 +4,7 @@
- endif
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- 
- AM_CPPFLAGS = -DPREFIX='"${prefix}"'
---- collectd-5.4.1/src/libcollectdclient/Makefile.am~  2014-01-26 09:09:14.000000000 +0100
-+++ collectd-5.4.1/src/libcollectdclient/Makefile.am   2014-10-04 22:36:28.911040409 +0200
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign no-dependencies
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- 
- pkginclude_HEADERS = collectd/client.h collectd/network.h collectd/network_buffer.h collectd/lcc_features.h