From fc016ff0c3cf15f9f74a031f0de744df1b0b301f2f2c49c9c5061a614dfdc206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojtek=20Dziewi=C4=99cki?= Date: Wed, 11 Apr 2012 08:58:20 +0000 Subject: [PATCH] Accepting request 113117 from home:tabraham1:branches:Base:System fixed bug 756197 OBS-URL: https://build.opensuse.org/request/show/113117 OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=99 --- cronie-1.4.8-bug_756197.diff | 20 ++++++++++++++++++++ cronie.changes | 6 ++++++ cronie.spec | 7 +++++-- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 cronie-1.4.8-bug_756197.diff diff --git a/cronie-1.4.8-bug_756197.diff b/cronie-1.4.8-bug_756197.diff new file mode 100644 index 0000000..e81aa12 --- /dev/null +++ b/cronie-1.4.8-bug_756197.diff @@ -0,0 +1,20 @@ +--- man/crontab.5.orig 2012-04-10 10:02:06.520889184 -0400 ++++ man/crontab.5 2012-04-10 10:03:19.752973655 -0400 +@@ -19,7 +19,7 @@ + .\" + .\" $Id: crontab.5,v 1.6 2004/01/23 19:03:33 vixie Exp $ + .\" +-.TH ANACRONTAB 5 "July 2010" "Marcela Mašláňová" "Cronie Users' Manual" ++.TH CRONTAB 5 "July 2010" "Marcela Mašláňová" "Cronie Users' Manual" + .SH NAME + crontab \- files used to schedule the execution of programs + .SH DESCRIPTION +@@ -274,7 +274,7 @@ + 0-59 * * * * id -Z > /tmp/SystemHigh/crontest + .fi + .SH FILES +-.I /etc/anacrontab ++.I /etc/crontab + system crontab file for jobs like cron.daily, weekly, monthly. + .I /var/spool/cron/ + a directory for storing crontabs defined by users. diff --git a/cronie.changes b/cronie.changes index e4f5dbb..a2df933 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 10 14:28:34 UTC 2012 - tabraham@novell.com + +- added cronie-1.4.8-bug_756197.diff to remove references to anacron + in crontab.5 + ------------------------------------------------------------------- Wed Jan 18 15:15:14 UTC 2012 - tabraham@novell.com diff --git a/cronie.spec b/cronie.spec index ce72ec6..791fd66 100644 --- a/cronie.spec +++ b/cronie.spec @@ -26,8 +26,6 @@ BuildRequires: libselinux-devel BuildRequires: pam-devel BuildRequires: systemd Url: https://fedorahosted.org/cronie/ -License: BSD-3-Clause and GPL-2.0 and MIT -Group: System/Daemons Recommends: smtp_daemon Recommends: postfix PreReq: permissions %fillup_prereq %insserv_prereq cron sysvinit(syslog) @@ -36,6 +34,8 @@ Version: 1.4.8 Release: 0 %{expand: %%define cronie_version %version} Summary: Cron Daemon +License: BSD-3-Clause and GPL-2.0 and MIT +Group: System/Daemons Source0: %name-%version.tar.gz Source1: cron.init Source2: run-crons @@ -57,6 +57,7 @@ Patch5: %name-crond_pid.diff Patch7: cronie-1.4.7-disable_logging.patch # PATCH-FIX-UPSTREAM use run-crons instead of run-parts for anacron (bnc#689494) Patch8: cronie-anacron-1.4.7-run-crons.patch +Patch9: cronie-1.4.8-bug_756197.diff Conflicts: cron <= 4.1 # When finish update protection of sles11 we could uncomment line bellow and drop all # ugly hacks with subpackage cron needed for proper update proces @@ -76,6 +77,7 @@ started automatically. Version: 4.2 Release: 0 Summary: Auxiliary package +Group: System/Daemons Requires: %{name} = %{cronie_version}-%{release} %description -n cron @@ -98,6 +100,7 @@ overloaded in settings. %patch5 -p1 %patch7 -p1 %patch8 -p1 +%patch9 cp %{S:7} ./cron_to_cronie.README %build