From 01d9efceca20dc22f622241f7a81731e16a9c7fcbeb37c80543be9081ef780cd Mon Sep 17 00:00:00 2001 From: Darin Perusich Date: Fri, 28 Jun 2013 12:36:06 +0000 Subject: [PATCH 1/3] Accepting request 181224 from home:coolo:branches:openSUSE:Factory - fix more of spamassasin's doc OBS-URL: https://build.opensuse.org/request/show/181224 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=113 --- collectd-fix_spamassassin_doc.patch | 15 +++++++++++++-- collectd.changes | 5 +++++ collectd.spec | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/collectd-fix_spamassassin_doc.patch b/collectd-fix_spamassassin_doc.patch index 7a480e4..a78bea5 100644 --- a/collectd-fix_spamassassin_doc.patch +++ b/collectd-fix_spamassassin_doc.patch @@ -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 diff --git a/collectd.changes b/collectd.changes index 1d4fc2d..483c7c6 100644 --- a/collectd.changes +++ b/collectd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/collectd.spec b/collectd.spec index ce99c50..e827c5f 100644 --- a/collectd.spec +++ b/collectd.spec @@ -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 # # All modifications and additions to the file contributed by third parties From 87249b138ac6b24e38d80dae9d5fbff6514b697fdc0a74e3cb54521445badcbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 1 Aug 2013 08:42:45 +0000 Subject: [PATCH 2/3] - Update the tarball so download_files serivce is silent. OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=114 --- collectd.changes | 5 +++++ iproute2-2.6.37.tar.bz2 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/collectd.changes b/collectd.changes index 483c7c6..170ec11 100644 --- a/collectd.changes +++ b/collectd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/iproute2-2.6.37.tar.bz2 b/iproute2-2.6.37.tar.bz2 index cbb24c4..83eeb71 100644 --- a/iproute2-2.6.37.tar.bz2 +++ b/iproute2-2.6.37.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71754f8ad68facdb97d0cb9d7a298dc7f1ba069370bce902b661e06959f264e3 -size 388866 +oid sha256:27153b0e9b751425522bba3d25c91ef20f359cb2f68049f058516df918b06b14 +size 38451 From db6122f28da27d404cda078c10fed500685a7751c0a8fbc79704253dc9722ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 1 Aug 2013 08:55:26 +0000 Subject: [PATCH 3/3] - Tarball was actually broken, rather stick with no download url, because upstream provides only 3.0 and newer for download now. OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=115 --- collectd.changes | 6 ++++++ collectd.spec | 4 +++- iproute2-2.6.37.tar.bz2 | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/collectd.changes b/collectd.changes index 170ec11..5ba7a09 100644 --- a/collectd.changes +++ b/collectd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/collectd.spec b/collectd.spec index e827c5f..6837047 100644 --- a/collectd.spec +++ b/collectd.spec @@ -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 diff --git a/iproute2-2.6.37.tar.bz2 b/iproute2-2.6.37.tar.bz2 index 83eeb71..cbb24c4 100644 --- a/iproute2-2.6.37.tar.bz2 +++ b/iproute2-2.6.37.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27153b0e9b751425522bba3d25c91ef20f359cb2f68049f058516df918b06b14 -size 38451 +oid sha256:71754f8ad68facdb97d0cb9d7a298dc7f1ba069370bce902b661e06959f264e3 +size 388866