Accepting request 477594 from server:monitoring

1

OBS-URL: https://build.opensuse.org/request/show/477594
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=25

collectd-5.5.2-exec-no-output.diff

@@ -0,0 +1,17 @@
+Index: b/src/utils_cmd_putval.c
+===================================================================
+--- a/src/utils_cmd_putval.c
++++ b/src/utils_cmd_putval.c
+@@ -217,10 +217,11 @@ int handle_putval (FILE *fh, char *buffe
+ 		values_submitted++;
+ 	} /* while (*buffer != 0) */
+ 	/* Done parsing the options. */
+-
++#if 0
+ 	print_to_socket (fh, "0 Success: %i %s been dispatched.\n",
+ 			values_submitted,
+ 			(values_submitted == 1) ? "value has" : "values have");
++#endif
+ 
+ 	sfree (vl.values);
+ 	return (0);

collectd.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Oct 30 15:53:07 UTC 2016 - seife+obs@b1-systems.com
+
+- rebase and rename collectd-5.5.2-exec-no-output.diff
+
 -------------------------------------------------------------------
 Sun Aug 14 15:34:41 UTC 2016 - benoit.monin@gmx.fr
 
@@ -561,6 +566,15 @@ Mon Mar  2 08:59:24 UTC 2015 - bruno@ioda-net.ch
 	* write_riemann: Receive acknowledge message when using TCP. Thanks to
 	  John-John Tedro. 
 
+-------------------------------------------------------------------
+Sun Nov  9 08:38:16 UTC 2014 - seife+obs@b1-systems.com
+
+- do not create a journal entry for every PUTVAL e.g. from the
+  exec plugin, collectd-5.4.1-exec-no-output.diff
+- remove crazy kernel-source build dependency
+- fix smp_mflags spelling to really build with multiple jobs
+- make build output verbose to let rpmlint find problems
+
 -------------------------------------------------------------------
 Sun Jul 20 19:37:18 UTC 2014 - p.drouand@gmail.com
 

collectd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package collectd
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2005-2013 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -153,6 +153,8 @@ Patch19:        collectd-fix_spamassassin_doc.patch
 Patch20:        collectd-split_README.patch
 Patch21:        collectd-fix_collectd_config_path_in_snmp_probe.patch
 Patch23:        collectd-javac_target.patch
+Patch25:        collectd-5.5.2-exec-no-output.diff
+
 # for /etc/apache2/... ownership (rpmlint):
 BuildRequires:  apache2
 BuildRequires:  autoconf
@@ -166,7 +168,7 @@ BuildRequires:  gettext
 BuildRequires:  gettext-devel
 BuildRequires:  intltool
 # for ipvs and madwifi:
-BuildRequires:  kernel-source
+#BuildRequires:  kernel-source
 BuildRequires:  libart_lgpl-devel
 BuildRequires:  libatasmart-devel
 BuildRequires:  libevent-devel
@@ -564,6 +566,7 @@ to write %{name} unixsock clients.
 %if 0%{?suse_version} <= 1140 && !0%{?sles_version}
 %patch24 -p1
 %endif
+%patch25 -p1
 
 sed -i 's|@@VERSION@@|%{version}|g' configure.ac
 
@@ -658,7 +661,7 @@ export KERNEL_DIR=%{_prefix}/src/linux
     --disable-serial
 %endif #os linux
 
-make %{?_smp_flags} \
+make %{?_smp_flags} V=1 \
 %if 0%{?suse_version} < 1120
      JAVAC_TARGET="-source 1.5 -target 1.5"
 %else