From dcf102a1e45c8e93c1af402471d580006e18f3079b986fc004cdc90cae9c6a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Wed, 30 Nov 2011 16:23:05 +0000 Subject: [PATCH 1/3] Accepting request 94560 from home:a_jaeger:branches:openSUSE:Factory Merge cron requests, fix starting of cron. OBS-URL: https://build.opensuse.org/request/show/94560 OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=92 --- cron.service | 2 +- cronie.changes | 12 ++++++++++++ cronie.spec | 6 +++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cron.service b/cron.service index cab8fa8..afb4c4e 100644 --- a/cron.service +++ b/cron.service @@ -1,6 +1,6 @@ [Unit] Description=Command Scheduler -After=syslog.target mail-transfer-agent.target +After=syslog.target mail-transfer-agent.target ypbind.service nscd.service network.target [Service] ExecStart=/usr/sbin/cron -n diff --git a/cronie.changes b/cronie.changes index 440cb2a..b34639e 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,8 +1,20 @@ +------------------------------------------------------------------- +Wed Nov 30 14:54:08 UTC 2011 - aj@suse.de + +- Add dependency on ypbind and nscd (bnc#732356) +- Do not install generic INSTALL file. +- Use set_permissions for newer distros. + ------------------------------------------------------------------- Wed Nov 30 09:47:40 UTC 2011 - coolo@suse.com - add automake as buildrequire to avoid implicit dependency +------------------------------------------------------------------- +Tue Nov 29 17:07:07 UTC 2011 - crrodriguez@opensuse.org + +- Cron started before network is up [bnc#733275] + ------------------------------------------------------------------- Fri Oct 7 12:11:17 UTC 2011 - fcrozat@suse.com diff --git a/cronie.spec b/cronie.spec index e29d3b8..3a0ae93 100644 --- a/cronie.spec +++ b/cronie.spec @@ -172,7 +172,11 @@ if [ -e /var/run/update_from_old_cron ]; then %__ln_s /bin/true /etc/init.d/cron fi %{fillup_and_insserv -y cron} +%if 0%{?suse_version} >= 1140 +%set_permissions /etc/crontab /usr/bin/crontab +%else %run_permissions +%endif %service_add_post cron.service %verifyscript @@ -200,7 +204,7 @@ fi %files %defattr(-,root,root) -%doc AUTHORS COPYING INSTALL README ChangeLog +%doc AUTHORS COPYING README ChangeLog %dir %attr(700,root,root) /var/spool/cron %dir %attr(700,root,root) /var/spool/cron/tabs %dir /var/spool/cron/lastrun From 53c578264cb4bc164ba348f7421a93c5c041265b0b2207931d266c4cd718c838 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 2 Dec 2011 19:19:51 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=93 --- cronie.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/cronie.spec b/cronie.spec index 3a0ae93..879076b 100644 --- a/cronie.spec +++ b/cronie.spec @@ -14,15 +14,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - # 3 : we don't need to do something with /etc/sysconfig/cron for now %define cron_configs \{/etc/init.d/cron,/etc/pam.d/crond,/etc/crontab,/etc/cron.deny,/etc/omc/srvinfo.d/cron.xml\} Name: cronie -BuildRequires: audit-devel automake libselinux-devel pam-devel systemd +BuildRequires: audit-devel +BuildRequires: automake +BuildRequires: libselinux-devel +BuildRequires: pam-devel +BuildRequires: systemd Url: https://fedorahosted.org/cronie/ -License: MIT and BSD3c and GPL-2 +License: BSD-3-Clause and GPL-2 and MIT Group: System/Daemons Recommends: smtp_daemon Recommends: postfix @@ -71,18 +73,17 @@ and cron.monthly. Scripts and programs that are located there are started automatically. %package -n cron -License: MIT and BSD and GPLv2 +License: BSD and GPL-2.0 and MIT Version: 4.2 -Release: 14 +Release: 0 Summary: Auxiliary package -Group: System/Daemons Requires: %{name} = %{cronie_version}-%{release} %description -n cron Auxiliary package, needed for proper update from vixie-cron 4.1 to cronie 1.4.4 %package anacron -License: MIT and BSD and GPLv2 +License: BSD and GPL-2.0 and MIT Summary: Utility for running regular jobs Group: System/Base Requires: %{name} = %{cronie_version} From b0b5095ac1b54e79d1a01de42b4895dc093ec3feeaaeae34990303537fc09b8d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 2 Dec 2011 19:20:43 +0000 Subject: [PATCH 3/3] fix license OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=94 --- cronie.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cronie.spec b/cronie.spec index 879076b..95843a9 100644 --- a/cronie.spec +++ b/cronie.spec @@ -24,7 +24,7 @@ BuildRequires: libselinux-devel BuildRequires: pam-devel BuildRequires: systemd Url: https://fedorahosted.org/cronie/ -License: BSD-3-Clause and GPL-2 and MIT +License: BSD-3-Clause and GPL-2.0 and MIT Group: System/Daemons Recommends: smtp_daemon Recommends: postfix @@ -73,7 +73,6 @@ and cron.monthly. Scripts and programs that are located there are started automatically. %package -n cron -License: BSD and GPL-2.0 and MIT Version: 4.2 Release: 0 Summary: Auxiliary package @@ -83,7 +82,6 @@ Requires: %{name} = %{cronie_version}-%{release} Auxiliary package, needed for proper update from vixie-cron 4.1 to cronie 1.4.4 %package anacron -License: BSD and GPL-2.0 and MIT Summary: Utility for running regular jobs Group: System/Base Requires: %{name} = %{cronie_version}