rpms/httpd/devel httpd-2.1.10-apctl.patch, 1.1, 1.2 httpd.spec, 1.102, 1.103

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28768

Modified Files:
	httpd-2.1.10-apctl.patch httpd.spec 
Log Message:
* Thu Dec  7 2006 Joe Orton <jorton at redhat.com> 2.2.3-8
- fix path to instdso.sh in special.mk (#217677)
- fix detection of links in "apachectl fullstatus"


httpd-2.1.10-apctl.patch:
 apachectl.in |   60 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 44 insertions(+), 16 deletions(-)

Index: httpd-2.1.10-apctl.patch
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd-2.1.10-apctl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.1.10-apctl.patch	2 Dec 2005 10:43:00 -0000	1.1
+++ httpd-2.1.10-apctl.patch	7 Dec 2006 11:29:37 -0000	1.2
@@ -24,7 +24,7 @@
  # 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


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- httpd.spec	5 Dec 2006 16:02:19 -0000	1.102
+++ httpd.spec	7 Dec 2006 11:29:37 -0000	1.103
@@ -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 @@
 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 -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 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Dec  7 2006 Joe Orton <jorton at 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 at redhat.com> 2.2.3-7
 - rebuild for libpq soname bump