Merge branch 'f15'

.gitignore

@@ -1,2 +1,3 @@
 cronie.systemd
 cronie-1.4.7.tar.gz
+/cronie-1.4.8.tar.gz

cronie.spec

@@ -6,8 +6,8 @@
 
 Summary:   Cron daemon for executing programs at set times
 Name:      cronie
-Version:   1.4.7
-Release:   3%{?dist}
+Version:   1.4.8
+Release:   1%{?dist}
 License:   MIT and BSD and ISC and GPLv2
 Group:     System Environment/Base
 URL:       https://fedorahosted.org/cronie
@@ -78,6 +78,15 @@ Requires:  %{name} = %{version}-%{release}
 %description noanacron
 Old style of {hourly,daily,weekly,monthly}.jobs without anacron. No features.
 
+%package sysvinit
+Summary:   Sysvinit script
+Group:     System Environment/Base
+Requires:  cronie
+Requires:  %{name} = %{version}-%{release}
+
+%description sysvinit
+Sysvinit initscript.
+
 %prep
 %setup -q
 
@@ -127,10 +136,10 @@ install -m 644 contrib/dailyjobs $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/dailyjobs
 # install systemd initscript
 mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/
 install -m 644 %SOURCE1 $RPM_BUILD_ROOT/lib/systemd/system/crond.service
-%else
+%endif
+# install sysvinit initscript into sub-package
 mkdir -pm755 $RPM_BUILD_ROOT%{_initrddir}
 install -m 755 cronie.init $RPM_BUILD_ROOT%{_initrddir}/crond
-%endif
 
 %post
 %if %{with systemd}
@@ -205,7 +214,6 @@ service crond condrestart > /dev/null 2>&1 ||:
 %endif
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING INSTALL README ChangeLog
 %attr(755,root,root) %{_sbindir}/crond
 %attr(6755,root,root) %{_bindir}/crontab
@@ -223,12 +231,9 @@ service crond condrestart > /dev/null 2>&1 ||:
 %attr(0644,root,root) %{_sysconfdir}/cron.d/0hourly
 %if %{with systemd}
 %attr(0644,root,root) /lib/systemd/system/crond.service
-%else
-%{_initrddir}/crond
 %endif
 
 %files anacron
-%defattr(-,root,root,-)
 %{_sbindir}/anacron
 %attr(0755,root,root) %{_sysconfdir}/cron.hourly/0anacron
 %config(noreplace) %{_sysconfdir}/anacrontab
@@ -240,10 +245,16 @@ service crond condrestart > /dev/null 2>&1 ||:
 %{_mandir}/man8/anacron.*
 
 %files noanacron
-%defattr(-,root,root,-)
 %attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs
 
+%files sysvinit
+%attr(0644,root,root) %{_initrddir}/crond
+
 %changelog
+* Tue Jun 28 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.4.8-1
+- update to 1.4.8
+- create sub-package sysvinit for initscript
+
 * Mon May  9 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.4.7-3
 - missing requirement on systemd-sysv for scriptlets
 

sources

@@ -1,2 +1,2 @@
 01014d53a9ede7c45f2419dc023cc372  cronie.systemd
-dfc26c47756d0c40ee27ae3c7ee98e0d  cronie-1.4.7.tar.gz
+9b1d2ce6db8d1883e06635f437170657  cronie-1.4.8.tar.gz