rpms/cronie
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Scriptlets are not created correctly if systemd is not in BR 986698.

Browse Source 
Remove sub-package sysvinit, which is not needed anymore
This commit is contained in:
Marcela Mašláňová 2013-07-22 14:10:15 +02:00
parent 773adb9501
commit 2da563359d
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cronie.spec
View File

@ -6,7 +6,7 @@
Summary: Cron daemon for executing programs at set times Summary: Cron daemon for executing programs at set times
Name: cronie Name: cronie
Version: 1.4.11 Version: 1.4.11
Release: 1%{?dist} Release: 2%{?dist}
License: MIT and BSD and ISC and GPLv2 License: MIT and BSD and ISC and GPLv2
Group: System Environment/Base Group: System Environment/Base
URL: https://fedorahosted.org/cronie URL: https://fedorahosted.org/cronie
@ -26,6 +26,9 @@ Buildrequires: pam-devel >= 1.0.1
Buildrequires: audit-libs-devel >= 1.4.1 Buildrequires: audit-libs-devel >= 1.4.1
%endif %endif
BuildRequires: systemd
Obsoletes: %{name}-sysvinit
Requires(post): coreutils sed Requires(post): coreutils sed
Requires(post): systemd Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
@ -70,16 +73,6 @@ Requires: %{name} = %{version}-%{release}
Old style of running {hourly,daily,weekly,monthly}.jobs without anacron. No Old style of running {hourly,daily,weekly,monthly}.jobs without anacron. No
extra features. extra features.
%package sysvinit
Summary: SysV init script for cronie
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires(post): /sbin/chkconfig
%description sysvinit
SysV style init script for cronie. It needs to be installed only if systemd
is not used as the system init process.
%prep %prep
%setup -q %setup -q
@ -128,9 +121,6 @@ install -m 644 contrib/dailyjobs $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/dailyjobs
# install systemd initscript # install systemd initscript
mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/
install -m 644 contrib/cronie.systemd $RPM_BUILD_ROOT/lib/systemd/system/crond.service install -m 644 contrib/cronie.systemd $RPM_BUILD_ROOT/lib/systemd/system/crond.service
# install sysvinit initscript into sub-package
mkdir -pm755 $RPM_BUILD_ROOT%{_initrddir}
install -m 755 cronie.init $RPM_BUILD_ROOT%{_initrddir}/crond
%post %post
# run after an installation # run after an installation
@ -176,9 +166,6 @@ exit 0
# when it calls pam # when it calls pam
/bin/systemctl try-restart crond.service >/dev/null 2>&1 || : /bin/systemctl try-restart crond.service >/dev/null 2>&1 || :
%triggerpostun -n cronie-sysvinit -- cronie < 1.4.8-1
/sbin/chkconfig --add crond >/dev/null 2>&1 || :
%files %files
%doc AUTHORS COPYING INSTALL README ChangeLog %doc AUTHORS COPYING INSTALL README ChangeLog
%attr(755,root,root) %{_sbindir}/crond %attr(755,root,root) %{_sbindir}/crond
@ -211,10 +198,11 @@ exit 0
%files noanacron %files noanacron
%attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs %attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs
%files sysvinit
%attr(0755,root,root) %{_initrddir}/crond
%changelog %changelog
* Mon Jul 22 2013 Marcela Mašláňová <mmaslano@redhat.com> - 1.4.11-2
- scriptlets are not created correctly if systemd is not in BR 986698
- remove sub-package sysvinit, which is not needed anymore
* Thu Jul 18 2013 Marcela Mašláňová <mmaslano@redhat.com> - 1.4.11-1 * Thu Jul 18 2013 Marcela Mašláňová <mmaslano@redhat.com> - 1.4.11-1
- new release 1.4.11 (contains previous bug fixes from 1.4.10-5) - new release 1.4.11 (contains previous bug fixes from 1.4.10-5)