From e91269ef400c30d01523e4300f8032089c07c6f3 Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Thu, 7 Dec 2006 11:29:37 +0000
Subject: [PATCH] - fix path to instdso.sh in special.mk (#217677) - fix
 detection of links in "apachectl fullstatus"

---
 httpd-2.1.10-apctl.patch |  2 +-
 httpd.spec               | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/httpd-2.1.10-apctl.patch b/httpd-2.1.10-apctl.patch
index b812fa0..4e34ea6 100644
--- a/httpd-2.1.10-apctl.patch
+++ b/httpd-2.1.10-apctl.patch
@@ -24,7 +24,7 @@ Upstream-Status: Vendor-specific changes for better initscript integration
  # url given on the command line.  Designed for lynx, however other
  # programs may work.  
 -LYNX="@LYNX_PATH@ -dump"
-+if [ -x "@LYNX_PATH" ]; then
++if [ -x "@LYNX_PATH@" ]; then
 +  LYNX="@LYNX_PATH@ -dump"
 +else
 +  LYNX=none
diff --git a/httpd.spec b/httpd.spec
index 5288f92..d1e3438 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.3
-Release: 7
+Release: 8
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -162,6 +162,9 @@ CFLAGS=$RPM_OPT_FLAGS
 SH_LDFLAGS="-Wl,-z,relro"
 export CFLAGS SH_LDFLAGS
 
+# Hard-code path to links to avoid unnecessary builddep
+export LYNX_PATH=/usr/bin/links
+
 function mpmbuild()
 {
 mpm=$1; shift
@@ -315,6 +318,10 @@ sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/httpd/conf/httpd.conf|" \
 sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \
     $RPM_BUILD_ROOT%{_includedir}/httpd/ap_config_layout.h
 
+# Fix path to instdso in special.mk
+sed -i '/instdso/s,top_srcdir,top_builddir,' \
+    $RPM_BUILD_ROOT%{_libdir}/httpd/build/special.mk
+
 # Remove unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.exp \
       $RPM_BUILD_ROOT/etc/httpd/conf/mime.types \
@@ -482,6 +489,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Dec  7 2006 Joe Orton <jorton@redhat.com> 2.2.3-8
+- fix path to instdso.sh in special.mk (#217677)
+- fix detection of links in "apachectl fullstatus"
+
 * Tue Dec  5 2006 Joe Orton <jorton@redhat.com> 2.2.3-7
 - rebuild for libpq soname bump