diff --git a/cronie-1.4.11.tar.gz b/cronie-1.4.11.tar.gz deleted file mode 100644 index df1cc44..0000000 --- a/cronie-1.4.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd08084cedddbb42499f80ddb7f2158195c3555c2ff40ee11d4ece2f9864d7be -size 222665 diff --git a/cronie-1.4.12.tar.gz b/cronie-1.4.12.tar.gz new file mode 100644 index 0000000..77cde41 --- /dev/null +++ b/cronie-1.4.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f5c9bf32f352599451c4ca0d6bc076d19e73ecfa5a90b34ecfe47c918c8bafd +size 234214 diff --git a/cronie.changes b/cronie.changes index 6fc7e29..4c53b17 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 22 09:39:02 UTC 2014 - kstreitova@suse.com + + - fixes bnc#833240: the first occurance of "/etc/anacrontab" +replaced with "/etc/crontab" in the manpage file + - version updated to 1.4.12 + * various small bugfixes + ------------------------------------------------------------------- Thu Sep 11 13:59:08 UTC 2014 - kstreitova@suse.com diff --git a/cronie.spec b/cronie.spec index 586ac7a..7719b20 100644 --- a/cronie.spec +++ b/cronie.spec @@ -19,7 +19,7 @@ # 3 : we don't need to do something with /etc/sysconfig/cron for now %define cron_configs \{%{_sysconfdir}/pam.d/crond,%{_sysconfdir}/crontab,%{_sysconfdir}/cron.deny,%{_sysconfdir}/omc/srvinfo.d/cron.xml\} Name: cronie -Version: 1.4.11 +Version: 1.4.12 Release: 0 Summary: Cron Daemon License: BSD-3-Clause and GPL-2.0 and MIT @@ -48,6 +48,9 @@ Patch7: cronie-1.4.7-disable_logging.patch Patch8: cronie-anacron-1.4.7-run-crons.patch Patch10: cronie-nofork-nopid.patch Patch12: cronie-piddir.patch +# PATCH-FIX-SUSE the first occurance of "/etc/anacrontab" was replaced by "/etc/crontab" +# in manpage file because the /etc/crontab is still used in SUSE. +Patch13: fix-manpage-replace-anacrontab-with-crontab.patch BuildRequires: audit-devel BuildRequires: libselinux-devel BuildRequires: pam-devel @@ -104,6 +107,7 @@ overloaded in settings. cp %{SOURCE7} ./cron_to_cronie.README %patch10 %patch12 -p1 +%patch13 -p1 %build # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked diff --git a/fix-manpage-replace-anacrontab-with-crontab.patch b/fix-manpage-replace-anacrontab-with-crontab.patch new file mode 100644 index 0000000..8755116 --- /dev/null +++ b/fix-manpage-replace-anacrontab-with-crontab.patch @@ -0,0 +1,27 @@ +From 8769bba06b1632c6bd275f88c0fd10f591efdb9b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Krist=C3=BDna=20Streitov=C3=A1?= +Date: Mon, 22 Sep 2014 10:41:14 +0200 +Subject: [PATCH] fix manpage replace anacrontab with crontab + +/etc/anacrontab replaced by /etc/crontab in the first occurance of it. +Fixes bnc#833240 +--- + man/cron.8 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/cron.8 b/man/cron.8 +index 633dbc0..9716f8f 100644 +--- a/man/cron.8 ++++ b/man/cron.8 +@@ -53,7 +53,7 @@ for crontab files which are named after accounts in + The found crontabs are loaded into the memory. + .I Cron + also searches for +-.I /etc/anacrontab ++.I /etc/crontab + and any files in the + .I /etc/cron.d + directory, which have a different format (see +-- +1.8.4.5 +