diff --git a/sysstat.changes b/sysstat.changes index fe12f7d..c963611 100644 --- a/sysstat.changes +++ b/sysstat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 23 15:56:10 UTC 2013 - p.drouand@gmail.com + +- Drop sysvinit support + ------------------------------------------------------------------- Fri Nov 9 15:36:58 UTC 2012 - vcizek@suse.com diff --git a/sysstat.init.suse b/sysstat.init.suse deleted file mode 100644 index 62e7a2e..0000000 --- a/sysstat.init.suse +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh -# Copyright (c) 2000-2009 SuSE GmbH Nuernberg, Germany. -# -# /etc/init.d/boot.sysstat -# -### BEGIN INIT INFO -# Provides: boot.sysstat -# Required-Start: boot.rootfsck boot.cleanup boot.clock -# Should-Start: $local_fs $remote_fs -# Required-Stop: boot.rootfsck boot.cleanup -# Should-Stop: $local_fs $remote_fs -# Default-Start: B -# Default-Stop: $null -# Short-Description: Write information about system start to sysstat log -# Description: Write information about system start to sysstat log -### END INIT INFO - -. /etc/rc.status -rc_reset - -case "$1" in - start) - echo "Running sadc" - /usr/lib/sa/sa1 --boot -S ALL 1>/dev/null 2>&1 && ln -fs /etc/sysstat/sysstat.cron /etc/cron.d/sysstat || rc_failed 1 - rc_status -v - ;; - - stop) - echo "Removing sysstat's crontab" - /bin/rm -f /etc/cron.d/sysstat - rc_status -v - ;; - - check|status) - echo -n "Checking for service sysstat: " - test -L /etc/cron.d/sysstat && test "`readlink /etc/cron.d/sysstat`" == /etc/sysstat/sysstat.cron || rc_failed 3 - rc_status -v - ;; - - restart|reload|probe) - rc_failed 3 - ;; - - *) - echo "Usage: $0 {start|stop|status}" - exit 1 - ;; - -esac - -rc_exit diff --git a/sysstat.spec b/sysstat.spec index 171c704..3520fae 100644 --- a/sysstat.spec +++ b/sysstat.spec @@ -1,7 +1,7 @@ # # spec file for package sysstat # -# Copyright (c) 2012 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 @@ -26,7 +26,6 @@ Url: http://pagesperso-orange.fr/sebastien.godard/ Source: http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2 Source1: isag.desktop Source2: sysstat.cron.suse -Source3: sysstat.init.suse Source4: sysstat.service # PATCH-FIX-OPENSUSE should be upstreamed # add locking to scripts sa1 and sa2 (bnc#7861) @@ -40,12 +39,9 @@ Patch2: sysstat-8.0.4-pagesize.diff Patch3: sysstat-8.0.4-sysconfdir.diff # PATCH-FIX-OPENSUSE avoid build dates in generated files Patch4: sysstat-9.0.4-no-build-date.patch -PreReq: %fillup_prereq -PreReq: %insserv_prereq Requires: gettext Requires: procmail %{?systemd_requires} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: findutils BuildRequires: sed @@ -82,7 +78,7 @@ from a sysstat package. if [ "%{_libdir}" != "/usr/lib" ]; then sed -i 's:/usr/lib:%{_libdir}:' %{S:4} fi -cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} . +cp %{SOURCE1} %{SOURCE2} %{SOURCE4} . %build export conf_dir="%{_sysconfdir}/sysstat" @@ -106,12 +102,11 @@ cp contrib/isag/isag %{buildroot}%{_bindir} cp contrib/isag/isag.1 %{buildroot}%{_mandir}/man1 rm -rf %{buildroot}%{_datadir}/doc/sysstat* install -D -m 0755 sysstat.cron.suse %{buildroot}%{_sysconfdir}/sysstat/sysstat.cron -install -D -m 0755 sysstat.init.suse %{buildroot}%{_sysconfdir}/init.d/boot.sysstat # change /usr/lib to /usr/lib64 or something else when needed if [ "%{_libdir}" != "/usr/lib" ]; then - sed -i 's:/usr/lib/:%{_libdir}/:g' %{buildroot}%{_sysconfdir}/init.d/boot.sysstat %{buildroot}%{_sysconfdir}/sysstat/sysstat.cron + sed -i 's:/usr/lib/:%{_libdir}/:g' %{buildroot}%{_sysconfdir}/sysstat/sysstat.cron fi -ln -s %{_sysconfdir}/init.d/boot.sysstat %{buildroot}%{_sbindir}/rcsysstat +ln -sf /sbin/service %{buildroot}%{_sbindir}/rcsysstat %find_lang %{name} install -d %{buildroot}%{_localstatedir}/lock/sa %{buildroot}%{_unitdir} install -D -m 0644 %{S:4} %{buildroot}%{_unitdir}/sysstat.service @@ -120,21 +115,15 @@ install -D -m 0644 %{S:4} %{buildroot}%{_unitdir}/sysstat.service %service_add_pre sysstat.service %preun -%{stop_on_removal boot.sysstat} %service_del_preun sysstat.service [ "$1" -gt 0 ] || rm -rf %{_localstatedir}/log/sa/* %post -%{fillup_and_insserv boot.sysstat} %service_add_post sysstat.service %postun -%{insserv_cleanup} %service_del_postun sysstat.service -%clean -rm -rf %{buildroot} - %files -f "%{name}.lang" %defattr(-,root,root) %doc CHANGES COPYING CREDITS FAQ README TODO @@ -146,7 +135,6 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/sysstat/sysstat %attr(644,root,root) %config(noreplace) %{_sysconfdir}/sysstat/sysstat.cron %attr(644,root,root) %config(noreplace) %{_sysconfdir}/sysstat/sysstat.ioconf -%attr(755,root,root) %{_sysconfdir}/init.d/boot.sysstat %{_bindir}/* %{_sbindir}/* %exclude %{_bindir}/isag