commit 3fbf942e7fc45880df8856c749be10e845d9f67d
Author: Elan Ruusamäe <[email protected]>
Date: Wed Jan 30 13:11:20 2013 +0200
only valid value for DISABLE_* is yes, no need for rc-scripts for that
tmpwatch.cron | 7 ++-----
tmpwatch.spec | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/tmpwatch.spec b/tmpwatch.spec
index 1371d31..b2b0b1d 100644
--- a/tmpwatch.spec
+++ b/tmpwatch.spec
@@ -24,7 +24,6 @@ Patch0: %{name}-boottime.patch
URL: https://fedorahosted.org/tmpwatch/
BuildRequires: autoconf >= 2.64
BuildRequires: automake
-Requires: rc-scripts
Suggests: crondaemon
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/tmpwatch.cron b/tmpwatch.cron
index b021f2e..b6abaa9 100755
--- a/tmpwatch.cron
+++ b/tmpwatch.cron
@@ -1,7 +1,4 @@
#!/bin/sh
-# Source function library for is_no()
-. /etc/rc.d/init.d/functions
-
#########
# Some defaults:
AMAVIS_QUARANTINE="1440"
@@ -13,7 +10,7 @@ fi
# NOTE: DISABLE_TMPWATCH_* vars are not official, only here to handle
migration from < 2.11-2.1
-if ! is_no "$DISABLE_TMPWATCH_CRON"; then
+if [ "$DISABLE_TMPWATCH_CRON" != "yes" ]; then
/usr/sbin/tmpwatch ${OPTIONS} -x /tmp/.X11-unix -x /tmp/.XIM-unix -x
/tmp/.font-unix \
-x /tmp/.ICE-unix -x /tmp/.Test-unix -X /tmp/.s.PGSQL.\* 240
/tmp
@@ -23,7 +20,7 @@ if ! is_no "$DISABLE_TMPWATCH_CRON"; then
fi
fi
-is_no "$DISABLE_TMPWATCH_CRON_DIRS" && exit 0
+[ "$DISABLE_TMPWATCH_CRON_DIRS" = "yes" ] && exit 0
# process extra .conf files
for file in /etc/tmpwatch/*.conf; do
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tmpwatch.git/commitdiff/3fbf942e7fc45880df8856c749be10e845d9f67d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
