Hello community,

here is the log from the commit of package collectl for openSUSE:Factory 
checked in at 2013-11-22 06:53:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-06-06 
14:50:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.collectl.new/collectl.changes   2013-11-22 
06:53:56.000000000 +0100
@@ -1,0 +2,10 @@
+Sat Oct 26 17:59:37 UTC 2013 - [email protected]
+
+- Drop sysvinit support; none of target distributions use sysvinit
+  anymore
+- Add systemd support
+- Install collectl in /usr/bin to get it launchable with systemd and 
+  link it in /usr/sbin
+- Add a sysconfig file
+
+-------------------------------------------------------------------

New:
----
  collectl.service
  collectl.sysconfig

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

Other differences:
------------------
++++++ collectl.spec ++++++
--- /var/tmp/diff_new_pack.37bpGC/_old  2013-11-22 06:53:57.000000000 +0100
+++ /var/tmp/diff_new_pack.37bpGC/_new  2013-11-22 06:53:57.000000000 +0100
@@ -23,10 +23,13 @@
 Url:            http://collectl.sourceforge.net
 Version:        3.6.7
 Release:        0
-Source:         %name-%version.src.tar.bz2
+Source0:        %name-%version.src.tar.bz2
+Source1:        collectl.service
+Source2:        collectl.sysconfig
 #PATCH-FIX-UPSTREAM init-cleanup.patch
 Patch1:         init-cleanup.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig(systemd)
+%{?systemd_requires}
 BuildArch:      noarch
 
 %description
@@ -41,28 +44,37 @@
 %build
 
 %install
-install -m 755 -D collectl.pl %buildroot%_sbindir/collectl
+# Install collectl in /usr/bin and link it in /usr/sbin
+install -m 755 -D collectl.pl %buildroot%_bindir/collectl
+mkdir -p %buildroot/%_sbindir
+ln -s  %_bindir/collectl %buildroot/%_sbindir/collectl
 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
 install -D sexpr.ph %buildroot%_datadir/%name/sexpr.ph
 install -D vmstat.ph %buildroot%_datadir/%name/vmstat.ph
-install -m 755 -D initd/collectl-suse %buildroot/%_sysconfdir/init.d/collectl
-ln -s /etc/init.d/collectl %buildroot%_sbindir/rccollectl
+install -m 755 -D %{SOURCE1} %buildroot/%{_unitdir}/collectl.service
+ln -sf /sbin/service %{buildroot}/usr/sbin/rccollectl
+install -m 644 -D %{SOURCE2} 
%buildroot/var/adm/fillup-templates/sysconfig.collectl
 install -m 644 -D man1/collectl.1 %buildroot%_mandir/man1/collectl.1 
 
+%post
+%{fillup_only}
+%service_add_post %{name}.service
+
 %preun
-%stop_on_removal collectl
+%service_del_preun %{name}.service
 
 %postun
-%restart_on_update collectl
-%insserv_cleanup
+%service_del_postun %{name}.service 
 
 %files
 %defattr(-,root,root)
 %doc docs/* COPYING ARTISTIC GPL README RELEASE-collectl
+%{_unitdir}/collectl.service
+/var/adm/fillup-templates/sysconfig.collectl
 %config(noreplace) %_sysconfdir/collectl.conf
-%_sysconfdir/init.d/collectl
+%_bindir/collectl
 %_sbindir/collectl
 %_sbindir/rccollectl
 %_datadir/collectl

++++++ collectl.service ++++++
[Unit]
Description=Performance data collection for a number of subsystems
After=network.target

[Service]
PIDFile=/var/run/collectl.pid
EnvironmentFile=/etc/sysconfig/collectl
ExecStart=/usr/bin/collectl $OPTS /etc/collectl.conf

[Install]
WantedBy=multi-user.target
++++++ collectl.sysconfig ++++++
#
# for list of available options see man page or /etc/collectd.conf
#
OPTS=-D
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to