Index: branches/fc17-dev/server/common/patches/httpd-sysv-deps.patch
===================================================================
--- branches/fc17-dev/server/common/patches/httpd-sysv-deps.patch	(revision 2206)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- a/httpd.init.orig	2011-11-05 19:10:18.897425517 -0400
-+++ b/httpd.init	2011-11-05 19:11:22.523201035 -0400
-@@ -12,7 +12,7 @@
- #
- ### BEGIN INIT INFO
- # Provides: httpd
--# Required-Start: $local_fs $remote_fs $network $named
-+# Required-Start: $local_fs $remote_fs $network $named openafs-client crond
- # Required-Stop: $local_fs $remote_fs $network
- # Should-Start: distcache
- # Short-Description: start and stop Apache HTTP Server
Index: branches/fc17-dev/server/fedora/specs/httpd.spec.patch
===================================================================
--- branches/fc17-dev/server/fedora/specs/httpd.spec.patch	(revision 2206)
+++ branches/fc17-dev/server/fedora/specs/httpd.spec.patch	(revision 2207)
@@ -10,5 +10,5 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -58,6 +58,15 @@
+@@ -58,6 +58,14 @@
  Requires(postun): systemd-units
  Requires(post): systemd-units
@@ -21,5 +21,4 @@
 +Patch1006: httpd-suexec-cloexec.patch
 +Patch1007: httpd-fixup-vhost.patch
-+Patch1008: httpd-sysv-deps.patch
 +
  %description
@@ -42,17 +41,5 @@
  
  %description -n mod_ssl
-@@ -114,6 +125,11 @@
- Security (TLS) protocols.
- 
- %prep
-+
-+# Horrible hack to patch the httpd.init file
-+cd $RPM_SOURCE_DIR
-+%patch1008 -p1 -b .sysv-deps
-+
- %setup -q
- %patch1 -p1 -b .apctl
- %patch2 -p1 -b .apxs
-@@ -133,6 +149,14 @@
+@@ -133,6 +149,13 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -64,5 +51,4 @@
 +%patch1006 -p1 -b .cloexec
 +%patch1007 -p1 -b .fixup-vhost
-+# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec
 +
  # Safety check: prevent build if defined MMN does not equal upstream MMN.