Accepting request 185396 from server:monitoring

- Tarball was actually broken, rather stick with no download url,
  because upstream provides only 3.0 and newer for download now.

- Update the tarball so download_files serivce is silent.

- fix more of spamassasin's doc

OBS-URL: https://build.opensuse.org/request/show/185396
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=14
This commit is contained in:
Stephan Kulow 2013-08-01 13:22:57 +00:00 committed by Git OBS Bridge
commit a1562b826f
3 changed files with 33 additions and 4 deletions

View File

@ -1,5 +1,7 @@
--- contrib/SpamAssassin/Collectd.pm.orig 2012-02-20 15:38:06.192423142 +0100
+++ contrib/SpamAssassin/Collectd.pm 2012-02-20 15:38:14.568422853 +0100
Index: contrib/SpamAssassin/Collectd.pm
===================================================================
--- contrib/SpamAssassin/Collectd.pm.orig
+++ contrib/SpamAssassin/Collectd.pm
@@ -4,12 +4,6 @@
Collectd - plugin for filling collectd with stats
@ -13,3 +15,12 @@
=head1 SYNOPSIS
loadplugin Mail::SpamAssassin::Plugin::Collectd
@@ -47,6 +41,8 @@ often it should try.
=cut
+=back
+
=head1 DESCRIPTION
This modules uses the email plugin of collectd from Sebastian Harl to

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Aug 1 08:54:24 UTC 2013 - tchvatal@suse.com
- Tarball was actually broken, rather stick with no download url,
because upstream provides only 3.0 and newer for download now.
-------------------------------------------------------------------
Thu Aug 1 08:40:54 UTC 2013 - tchvatal@suse.com
- Update the tarball so download_files serivce is silent.
-------------------------------------------------------------------
Fri Jun 28 07:25:05 UTC 2013 - coolo@suse.com
- fix more of spamassasin's doc
-------------------------------------------------------------------
Mon Aug 27 21:39:32 UTC 2012 - crrodriguez@opensuse.org

View File

@ -2,7 +2,7 @@
#
# spec file for package collectd
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2005-2012 Pascal Bleser <pascal.bleser@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@ -126,7 +126,9 @@ Source1: collectd.suse.init
Source2: collectd.apache2.conf
Source3: collectd-js.apache2.conf
# bundled/in-tree libnetlink.a, see http://mailman.verplant.org/pipermail/collectd/2007-October/001210.html
Source10: http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-%{libnetlink_version}.tar.bz2
# Can't use download url as upstream changed download layout and provide only versions 3.0 and newer.
# https://www.kernel.org/pub/linux/utils/net/iproute2/
Source10: iproute2-%{libnetlink_version}.tar.bz2
# workaround for missing pthread.pc on openSUSE, required by OpenIPMIpthread.pc
# see https://bugzilla.novell.com/show_bug.cgi?id=388026
Source20: collectd-pthread.pc