diff options
| author | jorton <jorton@fedoraproject.org> | 2006-12-07 11:29:37 +0000 |
|---|---|---|
| committer | jorton <jorton@fedoraproject.org> | 2006-12-07 11:29:37 +0000 |
| commit | e91269ef400c30d01523e4300f8032089c07c6f3 (patch) | |
| tree | 962e1eb07c21e4bdf9bda2d219366bc48181ddde /httpd.spec | |
| parent | d4de7742e0015c1844cf7b4fe0ce22f20e899998 (diff) | |
| download | httpd-e91269ef400c30d01523e4300f8032089c07c6f3.tar.gz httpd-e91269ef400c30d01523e4300f8032089c07c6f3.tar.xz httpd-e91269ef400c30d01523e4300f8032089c07c6f3.zip | |
- fix path to instdso.sh in special.mk (#217677)httpd-2_2_3-8
- fix detection of links in "apachectl fullstatus"
Diffstat (limited to 'httpd.spec')
| -rw-r--r-- | httpd.spec | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -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 |