Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e66056bef6107704ac20d78fdc334ca4b8434edb
commit e66056bef6107704ac20d78fdc334ca4b8434edb Author: Miklos Vajna <vmik...@frugalware.org> Date: Wed Aug 31 12:43:26 2011 +0200 dcron-4.5-2-i686 - drop no longer necessary sysv script diff --git a/source/base/dcron/FrugalBuild b/source/base/dcron/FrugalBuild index d28efd1..8cab708 100644 --- a/source/base/dcron/FrugalBuild +++ b/source/base/dcron/FrugalBuild @@ -3,27 +3,22 @@ pkgname=dcron pkgver=4.5 -pkgrel=1 +pkgrel=2 pkgdesc="Dillon's Cron daemon" url="http://www.jimpryor.net/linux/dcron" -depends=('glibc>=2.8-3') -rodepends=('systemd') -rodepends=('sysklogd>=1.5-3' 'psmisc>=22.6-3') +depends=('systemd' 'psmisc>=22.6-3') groups=('base') archs=('i686' 'x86_64' 'ppc' 'arm') backup=(var/spool/cron/crontabs/root) up2date="Flasttar $url" source=(http://www.jimpryor.net/linux/releases/dcron-$pkgver.tar.gz \ dcron4-add-systemd-unit-file.patch \ - run-parts run-parts.8.gz rc.crond root rc.crond-{de,hu}.po) + run-parts run-parts.8.gz root) sha1sums=('a1ca54820386d45dab6f7726482fa1aeddaa248f' \ 'b5c8ac94760866bdcb311ea849ff290101d77b24' \ 'b9fa3287f26a3f882bc50256b8a017f94458aa47' \ '7d4d036ba92819467b5186177e57fa0a861f86eb' \ - '9fff45fbec9c97a5edc52db36e7f4fd1a95f8a0c' \ - '29cdde5846c7f3ffa3cef2c3e4f14cf10cadcc99' \ - '9d855c0b62720f080d5b4cc2ad2ac3cb933b5497' \ - '65181250a12cdc6a62c63e794275d95edb736cf7') + '29cdde5846c7f3ffa3cef2c3e4f14cf10cadcc99') build() { @@ -35,7 +30,6 @@ build() Finstall 600 /var/spool/cron/crontabs/root Fexe /usr/bin/run-parts Ffile /usr/man/man8/run-parts.8 - Frcd2 crond Ffilerel extra/crond.service /lib/systemd/system/crond.service } diff --git a/source/base/dcron/dcron.install b/source/base/dcron/dcron.install index ef03797..c53120c 100644 --- a/source/base/dcron/dcron.install +++ b/source/base/dcron/dcron.install @@ -1,6 +1,5 @@ post_install() { - chkconfig --add rc.crond # On install (not upgrade), enable (but don't start) the # units by default systemctl enable crond.service >/dev/null 2>&1 @@ -11,16 +10,12 @@ post_upgrade() # Reload init system configuration, to make systemd honour # changed unit files systemctl daemon-reload >/dev/null 2>&1 - if [ `vercmp $2 4.4-5` -lt 0 ] ; then - if chkconfig rc.crond; then - post_install - fi - fi + # this can be removed after Frugalware-1.6 + rm -f /etc/rc.d/rc?.d/???rc.crond } pre_remove() { - chkconfig --del rc.crond # On uninstall (not upgrade), disable and stop the units systemctl --no-reload disable crond.service >/dev/null 2>&1 systemctl stop crond.service >/dev/null 2>&1 diff --git a/source/base/dcron/rc.crond b/source/base/dcron/rc.crond deleted file mode 100644 index 65a3ed6..0000000 --- a/source/base/dcron/rc.crond +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <bmh198...@yahoo.de> -# (c) 2003, 2010, 2011 Vajna Miklos <vmik...@frugalware.org> -# rc.crond for Frugalware -# distributed under GPL License - -# chkconfig: 2345 95 05 -# description: Cron daemon - -source /lib/initscripts/functions -TEXTDOMAIN=crond -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(restart start status stop) -daemon=$"cron daemon" - -pid="pidof crond 2> /dev/null" - -rc_start() -{ - start_msg - if [[ "$(eval $pid)" == "" ]] ; then - /usr/sbin/crond -S -l info - pidof crond >/var/run/crond.pid 2>/dev/null - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [[ "$(eval $pid)" != "" ]] ; then - killall crond - rm -f /var/run/crond.pid - ok $? - else - ok 999 - fi -} - -rc_exec $1 diff --git a/source/base/dcron/rc.crond-de.po b/source/base/dcron/rc.crond-de.po deleted file mode 100644 index ffadc86..0000000 --- a/source/base/dcron/rc.crond-de.po +++ /dev/null @@ -1,21 +0,0 @@ -# rc.crond. -# Copyright (C) 2005 THE rc.crond'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.crond package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: bmh 1980\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 23:16+0100\n" -"PO-Revision-Date: 2005-11-11 23:17+0100\n" -"Last-Translator: Marcus Habermehl <bmh198...@yahoo.de>\n" -"Language-Team: German <translation-team...@lists.sourceforge.net>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.crond:15 -msgid "cron daemon" -msgstr "Cron Daemon" diff --git a/source/base/dcron/rc.crond-hu.po b/source/base/dcron/rc.crond-hu.po deleted file mode 100644 index 6fd1a8d..0000000 --- a/source/base/dcron/rc.crond-hu.po +++ /dev/null @@ -1,21 +0,0 @@ -# rc.crond. -# Copyright (C) 2005 THE rc.crond'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.crond package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: bmh 1980\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 23:16+0100\n" -"PO-Revision-Date: 2005-11-11 23:17+0100\n" -"Last-Translator: Marcus Habermehl <bmh198...@yahoo.de>\n" -"Language-Team: Hungarian <translation-team...@lists.sourceforge.net>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.crond:15 -msgid "cron daemon" -msgstr "cron démon" diff --git a/source/base/dcron/rc.crond.pot b/source/base/dcron/rc.crond.pot deleted file mode 100644 index 4928d3f..0000000 --- a/source/base/dcron/rc.crond.pot +++ /dev/null @@ -1,21 +0,0 @@ -# rc.crond. -# Copyright (C) YEAR THE rc.crond'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.crond package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.crond\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 23:16+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <l...@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.crond:15 -msgid "cron daemon" -msgstr ""
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git