[cronie: 5/5] Merge branch 'f15'

[Marcela Mašláňová]

commit 665aa747d4344bdfe35a23b46853e0d5ae84c1ec
Merge: 30d9f9e b7c4281
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Tue Jun 28 12:33:55 2011 +0200

    Merge branch 'f15'

 .gitignore  |    1 +
 cronie.spec |   29 ++++++++++++++++++++---------
 sources     |    2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)
---
diff --cc cronie.spec
index 4d91d3f,486a5ac..3608392
--- a/cronie.spec
+++ b/cronie.spec
@@@ -127,10 -135,9 +136,10 @@@ install -m 644 contrib/dailyjobs $RPM_B
  # 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}
diff --cc sources
index b849879,2b830f2..0f6ef85
--- a/sources
+++ b/sources
@@@ -1,2 -1,1 +1,2 @@@
 +01014d53a9ede7c45f2419dc023cc372  cronie.systemd
- dfc26c47756d0c40ee27ae3c7ee98e0d  cronie-1.4.7.tar.gz
+ 9b1d2ce6db8d1883e06635f437170657  cronie-1.4.8.tar.gz