rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix path to instdso.sh in special.mk (#217677)

Browse Source 
- fix detection of links in "apachectl fullstatus"
This commit is contained in:
jorton 2006-12-07 11:29:37 +00:00
parent d4de7742e0
commit e91269ef40
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpd-2.1.10-apctl.patch
View File

@ -24,7 +24,7 @@ Upstream-Status: Vendor-specific changes for better initscript integration
# url given on the command line. Designed for lynx, however other # url given on the command line. Designed for lynx, however other
# programs may work. # programs may work.
-LYNX="@LYNX_PATH@ -dump" -LYNX="@LYNX_PATH@ -dump"
+if [ -x "@LYNX_PATH" ]; then +if [ -x "@LYNX_PATH@" ]; then
+ LYNX="@LYNX_PATH@ -dump" + LYNX="@LYNX_PATH@ -dump"
+else +else
+ LYNX=none + LYNX=none

13
httpd.spec
View File

@ -7,7 +7,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.2.3 Version: 2.2.3
Release: 7 Release: 8
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html Source1: index.html
@ -162,6 +162,9 @@ CFLAGS=$RPM_OPT_FLAGS
SH_LDFLAGS="-Wl,-z,relro" SH_LDFLAGS="-Wl,-z,relro"
export CFLAGS SH_LDFLAGS export CFLAGS SH_LDFLAGS
# Hard-code path to links to avoid unnecessary builddep
export LYNX_PATH=/usr/bin/links
function mpmbuild() function mpmbuild()
{ {
mpm=$1; shift 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' \ sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \
$RPM_BUILD_ROOT%{_includedir}/httpd/ap_config_layout.h $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 # Remove unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.exp \ rm -f $RPM_BUILD_ROOT%{_libdir}/*.exp \
$RPM_BUILD_ROOT/etc/httpd/conf/mime.types \ $RPM_BUILD_ROOT/etc/httpd/conf/mime.types \
@ -482,6 +489,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh %{_libdir}/httpd/build/*.sh
%changelog %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 * Tue Dec 5 2006 Joe Orton <jorton@redhat.com> 2.2.3-7
- rebuild for libpq soname bump - rebuild for libpq soname bump