Hello community,

here is the log from the commit of package collectl for openSUSE:Factory 
checked in at 2013-06-06 14:50:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/collectl (Old)
 and      /work/SRC/openSUSE:Factory/.collectl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "collectl"

Changes:
--------
--- /work/SRC/openSUSE:Factory/collectl/collectl.changes        2013-04-19 
15:30:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.collectl.new/collectl.changes   2013-06-06 
14:50:55.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jun  6 01:23:39 UTC 2013 - tabra...@suse.com
+
+- deleted bug-793027.patch : deprecated
+- init-cleanup.patch : init script cleanup
+- see RELEASE-collectl for list of changes between 3.4.3 and 3.6.7
+
+-------------------------------------------------------------------

Old:
----
  bug-793027.patch
  collectl-3.4.3.src.tar.bz2

New:
----
  collectl-3.6.7.src.tar.bz2
  init-cleanup.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ collectl.spec ++++++
--- /var/tmp/diff_new_pack.uP2R0o/_old  2013-06-06 14:50:56.000000000 +0200
+++ /var/tmp/diff_new_pack.uP2R0o/_new  2013-06-06 14:50:56.000000000 +0200
@@ -21,10 +21,11 @@
 License:        Artistic-1.0 and GPL-2.0+
 Group:          System/Monitoring
 Url:            http://collectl.sourceforge.net
-Version:        3.4.3
+Version:        3.6.7
 Release:        0
 Source:         %name-%version.src.tar.bz2
-Patch1:         bug-793027.patch
+#PATCH-FIX-UPSTREAM init-cleanup.patch
+Patch1:         init-cleanup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -35,13 +36,12 @@
 
 %prep
 %setup -q 
-%patch1 -p1
+%patch1
 
 %build
 
 %install
 install -m 755 -D collectl.pl %buildroot%_sbindir/collectl
-install -m 755 -D readS %buildroot%_sbindir/collectl-readS
 install -m 644 -D collectl.conf %buildroot/%_sysconfdir/collectl.conf
 install -D formatit.ph %buildroot%_datadir/%name/formatit.ph
 install -D lexpr.ph %buildroot%_datadir/%name/lexpr.ph
@@ -64,7 +64,6 @@
 %config(noreplace) %_sysconfdir/collectl.conf
 %_sysconfdir/init.d/collectl
 %_sbindir/collectl
-%_sbindir/collectl-readS
 %_sbindir/rccollectl
 %_datadir/collectl
 %_mandir/man1/collectl.1.gz

++++++ collectl-3.4.3.src.tar.bz2 -> collectl-3.6.7.src.tar.bz2 ++++++
++++ 16809 lines of diff (skipped)

++++++ init-cleanup.patch ++++++
From: T.M Abraham <tabra...@suse.com>
Subject: init cleanup
Upstream: submitted

This patch does some cleanup of the init script for openSUSE.

* /var/lock/subsys is neither used or supported on openSUSE, so
  use is removed
* change $all to $ALL - both work, but $ALL is more correct
* don't insert collectl in runlevel 4, which is admin defined
  and therefore should not be used by distribution scripts

---

--- initd/collectl-suse.orig    2013-06-05 21:15:00.522844781 -0400
+++ initd/collectl-suse 2013-06-05 21:15:19.702843470 -0400
@@ -8,9 +8,9 @@
 #
 ### BEGIN INIT INFO
 # Provides:          collectl
-# Required-Start:    $all
-# Required-Stop:     $all
-# Default-Start:     2 3 4 5
+# Required-Start:    $ALL
+# Required-Stop:     $ALL
+# Default-Start:     2 3 5
 # Default-Stop:      0 1 6
 # Short-Description: Collectl monitors system performance.
 # Description:       Collectl is a light-weight performance monitoring
@@ -94,10 +94,7 @@
       if [ -f $PIDFILE ]; then
           echo -n "Shutting down $PNAME: "
           killproc -p $PIDFILE collectl
-         RETVAL=$?
          rc_status -v
-          echo
-          [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$PNAME
       else
           echo "$PNAME not running"
       fi
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to