Index: server/fedora/ref-prepatch/httpd.spec
===================================================================
--- server/fedora/ref-prepatch/httpd.spec	(revision 296)
+++ server/fedora/ref-prepatch/httpd.spec	(revision 297)
@@ -60,6 +60,4 @@
 Conflicts: pcre < 4.0
 
-Patch1000: httpd-suexec-scripts.patch
-
 %description
 The Apache HTTP Server is a powerful, efficient, and extensible
@@ -128,6 +126,4 @@
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
-
-%patch1000 -p1 -b .scripts
 
 # Safety check: prevent build if defined MMN does not equal upstream MMN.
@@ -290,7 +286,7 @@
 
 # symlinks for /etc/httpd
-ln -s $RPM_BUILD_ROOT%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
-ln -s $RPM_BUILD_ROOT%{_localstatedir}/run $RPM_BUILD_ROOT/etc/httpd/run
-ln -s $RPM_BUILD_ROOT%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
+ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
+ln -s ../..%{_localstatedir}/run $RPM_BUILD_ROOT/etc/httpd/run
+ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
 
 # install SYSV init stuff