- up to 1.5.2

[packages/cronie.git] / cronie.spec

diff --git a/cronie.spec b/cronie.spec
index f59eda879231750142c9a28e511c064e8e381e80..b081affda7003adca514c8524ae32e8dd0146b8a 100644 (file)
--- a/cronie.spec
+++ b/cronie.spec
@@ -15,26 +15,26 @@
 %endif
 
 Summary:       Cron daemon for executing programs at set times
 %endif
 
 Summary:       Cron daemon for executing programs at set times

+Summary(pl.UTF-8):     Demon cron do uruchamiania programów o zadanym czasie

 Name:          cronie
 Name:          cronie

-Version:       1.4.12
+Version:       1.5.2

 Release:       1
 License:       MIT and BSD and GPL v2
 Group:         Daemons
 Release:       1
 License:       MIT and BSD and GPL v2
 Group:         Daemons

-Source0:       https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
-# Source0-md5: 199db91e514a4d75e3222d69874b132f
+Source0:       https://github.com/cronie-crond/cronie/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 703314f58a49ea136e9966d3937d9bf4

 Source1:       %{name}.init
 Source1:       %{name}.init

-Source2:       cron.logrotate

 Source3:       cron.sysconfig
 Source4:       %{name}.crontab
 Source5:       %{name}.pam
 Source3:       cron.sysconfig
 Source4:       %{name}.crontab
 Source5:       %{name}.pam

-Source6:       %{name}.upstart
-Source7:       crond.service
+Source6:       crond.service

 Patch0:                inotify-nosys.patch
 Patch1:                sendmail-path.patch
 Patch0:                inotify-nosys.patch
 Patch1:                sendmail-path.patch

-URL:           https://fedorahosted.org/cronie/
+URL:           https://github.com/cronie-crond/cronie/

 %{?with_audit:BuildRequires:   audit-libs-devel}
 %{?with_audit:BuildRequires:   audit-libs-devel}

-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.60

 BuildRequires: automake
 BuildRequires: automake

+BuildRequires: glibc-devel >= 6:2.21

 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: pam-devel
 BuildRequires: rpm >= 4.4.9-56
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: pam-devel
 BuildRequires: rpm >= 4.4.9-56


@@ -54,6 +54,7 @@ Requires:     systemd-units >= 38}
 %{?with_inotify:Requires:      uname(release) >= 2.6.13}
 Provides:      crondaemon
 Provides:      crontabs = 1.7
 %{?with_inotify:Requires:      uname(release) >= 2.6.13}
 Provides:      crondaemon
 Provides:      crontabs = 1.7

+Provides:      cronjobs

 Provides:      group(crontab)
 %if "%{pld_release}" == "th"
 Provides:      vixie-cron = 4.3-1
 Provides:      group(crontab)
 %if "%{pld_release}" == "th"
 Provides:      vixie-cron = 4.3-1


@@ -61,19 +62,31 @@ Provides:   vixie-cron = 4.3-1
 Obsoletes:     crondaemon
 Obsoletes:     cronie-systemd
 Obsoletes:     crontabs
 Obsoletes:     crondaemon
 Obsoletes:     cronie-systemd
 Obsoletes:     crontabs

+Obsoletes:     cronjobs

 %if "%{pld_release}" == "th"
 Obsoletes:     vixie-cron < 4.3-1
 %endif
 %if "%{pld_release}" == "th"
 Obsoletes:     vixie-cron < 4.3-1
 %endif

+Conflicts:     sysklogd < 1.5.1-2
+Conflicts:     syslog-ng < 3.6.4-3
+Conflicts:     rsyslog < 5.10.1-4

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Cronie contains the standard UNIX daemon crond that runs specified
 programs at scheduled times and related tools. It is based on the
 original cron and has security and configuration enhancements like the
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Cronie contains the standard UNIX daemon crond that runs specified
 programs at scheduled times and related tools. It is based on the
 original cron and has security and configuration enhancements like the

-ability to use pam and SELinux.
+ability to use PAM and SELinux.
+
+%description -l pl.UTF-8
+Cronie zawiera standardowego demona uniksowego crond, uruchamiającego
+podane programy o zadanym czasie, oraz powiązane narzędzia. Jest
+oparty na oryginalnym cronie i zawiera rozszerzenia bezpieczeństwa i
+konfiguracji, takie jak możliwość wykorzystania mechanizmów PAM i
+SELinux.

 
 %package anacron
 Summary:       Utility for running regular jobs
 
 %package anacron
 Summary:       Utility for running regular jobs

+Summary(pl.UTF-8):     Narzędzie do uruchamiania regularnych zadań

 Group:         Base
 Provides:      anacron = 2.4
 Obsoletes:     anacron <= 2.3
 Group:         Base
 Provides:      anacron = 2.4
 Obsoletes:     anacron <= 2.3


@@ -83,18 +96,10 @@ Anacron becames part of cronie. Anacron is used only for running
 regular jobs. The default settings execute regular jobs by anacron,
 however this could be overloaded in settings.
 
 regular jobs. The default settings execute regular jobs by anacron,
 however this could be overloaded in settings.
 

-%package upstart
-Summary:       Upstart job description for Cronie
-Summary(pl.UTF-8):     Opis zadania Upstart dla Cronie
-Group:         Daemons
-Requires:      %{name} = %{version}-%{release}
-Requires:      upstart >= 0.6
-
-%description upstart
-Upstart job description for Cronie.
-
-%description upstart -l pl.UTF-8
-Opis zadania Upstart dla Cronie.
+%description anacron -l pl.UTF-8
+Anacron stał się częścią cronie. Służy tylko do uruchamiania
+regularnych zadań. Domyślne ustawienia wykonują zadania przy użyciu
+anacrona, ale może to być zmienione w ustawieniach.

 
 %prep
 %setup -q
 
 %prep
 %setup -q


@@ -111,23 +116,23 @@ Opis zadania Upstart dla Cronie.
        SYS_CROND_DIR=/etc/cron.d \
        --sysconfdir=/etc/cron \
        --with-editor=/bin/vi \
        SYS_CROND_DIR=/etc/cron.d \
        --sysconfdir=/etc/cron \
        --with-editor=/bin/vi \

+       --with-audit%{!?with_audit:=no} \
+       --with-inotify%{!?with_inotify:=no} \

        --with-pam \
        --with-pam \

-       --with%{!?with_selinux:out}-selinux \
-       --with%{!?with_audit:out}-audit \
-       --with%{!?with_inotify:out}-inotify \
+       --with-selinux%{!?with_selinux:=no} \

        --disable-syscrontab \
        --disable-syscrontab \

+       --enable-anacron \

 %if "%{cc_version}" >= "3.4"
        --enable-pie \
 %endif
 %if "%{cc_version}" >= "3.4"
        --enable-pie \
 %endif

-       --enable-relro \
-       --enable-anacron
+       --enable-relro

 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/var/{log,spool/{ana,}cron},%{_mandir},%{systemdunitdir}}\
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/var/{log,spool/{ana,}cron},%{_mandir},%{systemdunitdir}}\

-       $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig,init} \
+       $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig} \

        $RPM_BUILD_ROOT%{_sysconfdir}/{cron,cron.{d,hourly,daily,weekly,monthly},pam.d}
 
 %{__make} install \
        $RPM_BUILD_ROOT%{_sysconfdir}/{cron,cron.{d,hourly,daily,weekly,monthly},pam.d}
 
 %{__make} install \


@@ -143,14 +148,11 @@ cp -p %{SOURCE5} crond.pam
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond
 cp -a contrib/0anacron $RPM_BUILD_ROOT/etc/cron.hourly/0anacron
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond
 cp -a contrib/0anacron $RPM_BUILD_ROOT/etc/cron.hourly/0anacron

-cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/cron
+cp -a contrib/anacrontab $RPM_BUILD_ROOT/etc/cron/anacrontab

 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/cron
 cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/crontab
 cp -a crond.pam  $RPM_BUILD_ROOT/etc/pam.d/crond
 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/cron
 cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/crontab
 cp -a crond.pam  $RPM_BUILD_ROOT/etc/pam.d/crond

-cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/init/crond.conf
-cp -a %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/crond.service
-
-touch $RPM_BUILD_ROOT/var/log/cron
+cp -a %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/crond.service

 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/cron/cron.allow << 'EOF'
 # cron.allow   This file describes the names of the users which are
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/cron/cron.allow << 'EOF'
 # cron.allow   This file describes the names of the users which are


@@ -170,9 +172,6 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 117 -r -f crontab
 
 %post
 %groupadd -g 117 -r -f crontab
 
 %post

-if [ ! -f /var/log/cron ]; then
-       install -m 660 -g crontab /dev/null /var/log/cron
-fi

 /sbin/chkconfig --add crond
 %service crond restart "Cron Daemon"
 %systemd_post crond.service
 /sbin/chkconfig --add crond
 %service crond restart "Cron Daemon"
 %systemd_post crond.service


@@ -216,46 +215,39 @@ chmod 754 /etc/rc.d/init.d/crond
 /sbin/chkconfig --del crond
 /sbin/chkconfig --add crond
 
 /sbin/chkconfig --del crond
 /sbin/chkconfig --add crond
 

-%post upstart
-%upstart_post crond
-
-%postun upstart
-%upstart_postun crond
-

 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README

-%attr(750,root,crontab) %dir %{_sysconfdir}/cron*
+%attr(750,root,crontab) %dir /etc/cron
+%attr(750,root,crontab) %dir /etc/cron.daily
+%attr(750,root,crontab) %dir /etc/cron.hourly
+%attr(750,root,crontab) %dir /etc/cron.monthly
+%attr(750,root,crontab) %dir /etc/cron.weekly

 %attr(640,root,crontab) %config(noreplace,missingok) /etc/cron.d/crontab
 %attr(640,root,crontab) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/cron/cron.allow
 %attr(640,root,crontab) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/cron/cron.deny
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cron
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/crond
 %attr(754,root,root) /etc/rc.d/init.d/crond
 %attr(640,root,crontab) %config(noreplace,missingok) /etc/cron.d/crontab
 %attr(640,root,crontab) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/cron/cron.allow
 %attr(640,root,crontab) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/cron/cron.deny
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cron
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/crond
 %attr(754,root,root) /etc/rc.d/init.d/crond

-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/cron

 %{systemdunitdir}/crond.service
 %attr(755,root,root) %{_sbindir}/crond
 %{systemdunitdir}/crond.service
 %attr(755,root,root) %{_sbindir}/crond

+%attr(2755,root,crontab) %{_bindir}/cronnext

 %attr(2755,root,crontab) %{_bindir}/crontab
 
 %{_mandir}/man8/crond.8*
 %{_mandir}/man8/cron.8*
 %{_mandir}/man5/crontab.5*
 %attr(2755,root,crontab) %{_bindir}/crontab
 
 %{_mandir}/man8/crond.8*
 %{_mandir}/man8/cron.8*
 %{_mandir}/man5/crontab.5*

+%{_mandir}/man1/cronnext.1*

 %{_mandir}/man1/crontab.1*
 
 %attr(1730,root,crontab) /var/spool/cron
 %{_mandir}/man1/crontab.1*
 
 %attr(1730,root,crontab) /var/spool/cron

-%attr(660,root,crontab) %ghost /var/log/cron

 
 %files anacron
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/anacron
 %attr(755,root,root) %{_sysconfdir}/cron.hourly/0anacron
 
 %files anacron
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/anacron
 %attr(755,root,root) %{_sysconfdir}/cron.hourly/0anacron

+%attr(640,root,crontab) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/cron/anacrontab

 %{_mandir}/man5/anacrontab.5*
 %{_mandir}/man8/anacron.8*
 
 %attr(1730,root,crontab) /var/spool/anacron
 %{_mandir}/man5/anacrontab.5*
 %{_mandir}/man8/anacron.8*
 
 %attr(1730,root,crontab) /var/spool/anacron

-
-%if "%{pld_release}" == "th"
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/crond.conf
-%endif