Hello community, here is the log from the commit of package collectl for openSUSE:Factory checked in at 2013-04-19 15:30:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectl (Old) and /work/SRC/openSUSE:Factory/.collectl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectl", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/collectl/collectl.changes 2011-09-23 01:53:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.collectl.new/collectl.changes 2013-04-19 15:30:57.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Mar 5 05:55:17 UTC 2013 - [email protected] + +- update license to new format + +------------------------------------------------------------------- +Wed Dec 5 21:46:00 UTC 2012 - [email protected] + +- bug-793027.patch: fix for collectl init script (bnc #793027) + +------------------------------------------------------------------- New: ---- bug-793027.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectl.spec ++++++ --- /var/tmp/diff_new_pack.773dAp/_old 2013-04-19 15:31:38.000000000 +0200 +++ /var/tmp/diff_new_pack.773dAp/_new 2013-04-19 15:31:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package collectl # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,15 @@ # - Name: collectl Summary: Collects data that describes the current system status -License: Artistic-1.0 ; GPL-2.0+ -Url: http://collectl.sourceforge.net +License: Artistic-1.0 and GPL-2.0+ Group: System/Monitoring +Url: http://collectl.sourceforge.net Version: 3.4.3 -Release: 1 +Release: 0 Source: %name-%version.src.tar.bz2 +Patch1: bug-793027.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -35,6 +35,7 @@ %prep %setup -q +%patch1 -p1 %build ++++++ bug-793027.patch ++++++ --- collectl-3.4.3.orig/initd/collectl-suse 2010-09-08 08:43:00.000000000 -0400 +++ collectl-3.4.3/initd/collectl-suse 2012-12-05 14:19:27.863130943 -0500 @@ -21,7 +21,10 @@ # to read format. ### END INIT INFO -COLLECTL=/usr/bin/collectl +[ -r /etc/rc.status ] && . /etc/rc.status +rc_reset + +COLLECTL=/usr/sbin/collectl if [ ! -f $COLLECTL ]; then echo -n "Cannot find $COLLECTL" rc_status -s @@ -56,9 +59,6 @@ PROCNAME=$PNAME PIDFILE="/var/run/$PNAME.pid" -[ -r /etc/rc.status ] && . /etc/rc.status -rc_reset - # If a pidfile, make sure it's not stale and if it is, collectl not running if [ -f $PIDFILE ]; then pid=`cat $PIDFILE` -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
