update to 5.2.1

5 files changed, 21 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index 5df46ca..c9d70df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/collectd-5.2.0.tar.bz2
+/collectd-5.2.1.tar.bz2
diff --git a/collectd-include-collectd.d.patch b/collectd-include-collectd.d.patch
index 2e5dcd0..7b3d469 100644
--- a/collectd-include-collectd.d.patch
+++ b/collectd-include-collectd.d.patch
@@ -1,14 +1,14 @@
---- src/collectd.conf.in.orig	2012-02-19 11:17:59.000000000 +0100
-+++ src/collectd.conf.in	2012-02-26 15:54:51.463235956 +0100
-@@ -19,6 +19,7 @@
- #Interval     10
+--- src/collectd.conf.in.orig	2013-01-27 14:47:18.246255910 +0100
++++ src/collectd.conf.in	2013-02-04 00:18:28.457298392 +0100
+@@ -28,6 +28,7 @@
+ 
  #Timeout      2
  #ReadThreads  5
 +Include      "/etc/collectd.d"
  
  ##############################################################################
  # Logging                                                                    #
-@@ -123,7 +124,7 @@
+@@ -136,7 +137,7 @@
  #@BUILD_PLUGIN_REDIS_TRUE@LoadPlugin redis
  #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
  #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
diff --git a/collectd.spec b/collectd.spec
index 997b1c4..5b672c1 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,6 +1,6 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 5.2.0
+Version: 5.2.1
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
@@ -547,6 +547,7 @@ fi
 %doc %{_mandir}/man1/collectd.1*
 %doc %{_mandir}/man1/collectdctl.1*
 %doc %{_mandir}/man1/collectd-nagios.1*
+%doc %{_mandir}/man1/collectd-tg.1*
 %doc %{_mandir}/man1/collectdmon.1*
 %doc %{_mandir}/man5/collectd.conf.5*
 %doc %{_mandir}/man5/collectd-exec.5*
@@ -659,6 +660,10 @@ fi
 %endif
 
 %changelog
+* Mon Feb 04 2013 Alan Pevec <apevec@redhat.com> 5.2.1-1
+- update to 5.2.1
+  http://mailman.verplant.org/pipermail/collectd/2013-January/005577.html
+
 * Mon Nov 26 2012 Alan Pevec <apevec@redhat.com> 5.2.0-1
 - update to 5.2.0 from Steve Traylen rhbz#877721
 
diff --git a/fixperlinstall.patch b/fixperlinstall.patch
index 1b8a2f2..f11d573 100644
--- a/fixperlinstall.patch
+++ b/fixperlinstall.patch
@@ -1,23 +1,21 @@
-diff -Nur bindings/Makefile.am bindings/Makefile.am
---- bindings/Makefile.am	2012-11-11 03:43:05.000000000 -0700
-+++ bindings/Makefile.am	2012-11-18 10:34:15.937674174 -0700
-@@ -48,7 +48,7 @@
+--- bindings/Makefile.am.orig	2013-01-27 14:47:05.000000000 +0100
++++ bindings/Makefile.am	2013-02-04 00:48:01.854444442 +0100
+@@ -45,7 +45,7 @@
  
  buildperl/Makefile: .perl-directory-stamp buildperl/Makefile.PL \
  	$(top_builddir)/config.status
--	cd buildperl && @PERL@ Makefile.PL INSTALL_BASE=$(prefix) @PERL_BINDINGS_OPTIONS@
+-	cd buildperl && @PERL@ Makefile.PL INSTALL_BASE=$(DESTDIR)$(prefix) @PERL_BINDINGS_OPTIONS@
 +	cd buildperl && @PERL@ Makefile.PL @PERL_BINDINGS_OPTIONS@
  
  buildperl/Makefile.PL: .perl-directory-stamp $(top_builddir)/config.status
  
-diff -Nur bindings/Makefile.in bindings/Makefile.in
---- bindings/Makefile.in	2012-11-18 10:33:13.530044620 -0700
-+++ bindings/Makefile.in	2012-11-18 10:34:21.340724920 -0700
-@@ -710,7 +710,7 @@
+--- bindings/Makefile.in.orig	2013-01-27 14:47:35.000000000 +0100
++++ bindings/Makefile.in	2013-02-04 00:48:51.440147674 +0100
+@@ -716,7 +716,7 @@
  
  buildperl/Makefile: .perl-directory-stamp buildperl/Makefile.PL \
  	$(top_builddir)/config.status
--	cd buildperl && @PERL@ Makefile.PL INSTALL_BASE=$(prefix) @PERL_BINDINGS_OPTIONS@
+-	cd buildperl && @PERL@ Makefile.PL INSTALL_BASE=$(DESTDIR)$(prefix) @PERL_BINDINGS_OPTIONS@
 +	cd buildperl && @PERL@ Makefile.PL @PERL_BINDINGS_OPTIONS@
  
  buildperl/Makefile.PL: .perl-directory-stamp $(top_builddir)/config.status
diff --git a/sources b/sources
index eef037b..45d0d63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8544f3881937c21ab3409dd3f6449f4  collectd-5.2.0.tar.bz2
+350934cfea62d37e10191816744f0eb7  collectd-5.2.1.tar.bz2