diff options
author | jorton <jorton@fedoraproject.org> | 2006-07-19 12:28:45 +0000 |
---|---|---|
committer | jorton <jorton@fedoraproject.org> | 2006-07-19 12:28:45 +0000 |
commit | 8395baecec62abdd1ca25859a5f1522bd337cbfc (patch) | |
tree | 1c2aafd376709e8c1227ee1a8161b5c998412719 | |
parent | 586390eb8c8860b2441bd7a5764889ae0ff1f5b6 (diff) | |
download | httpd-8395baecec62abdd1ca25859a5f1522bd337cbfc.tar.gz httpd-8395baecec62abdd1ca25859a5f1522bd337cbfc.tar.xz httpd-8395baecec62abdd1ca25859a5f1522bd337cbfc.zip |
- fix "apxs -g"-generated Makefilehttpd-2_2_2-7
- fix buildconf with autoconf 2.60
-rw-r--r-- | .cvsignore | 3 | ||||
-rw-r--r-- | httpd-2.1.10-apxs.patch | 2 | ||||
-rw-r--r-- | httpd.spec | 10 |
3 files changed, 12 insertions, 3 deletions
@@ -1 +1,4 @@ httpd-2.2.2.tar.gz +*.rpm +x86_64 +clog diff --git a/httpd-2.1.10-apxs.patch b/httpd-2.1.10-apxs.patch index 7b49222..3fbc90a 100644 --- a/httpd-2.1.10-apxs.patch +++ b/httpd-2.1.10-apxs.patch @@ -88,7 +88,7 @@ -top_builddir=%PREFIX% -include %INSTALLBUILDDIR%/special.mk +top_builddir=%LIBDIR%/httpd -+include %LIBDIR%/httpd/special.mk ++include %LIBDIR%/httpd/build/special.mk # the used tools APXS=apxs @@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.2.2 -Release: 5.1 +Release: 7 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -31,6 +31,7 @@ Patch2: httpd-2.1.10-apxs.patch Patch3: httpd-2.0.45-deplibs.patch Patch4: httpd-2.1.10-disablemods.patch Patch5: httpd-2.1.10-layout.patch +Patch6: httpd-2.2.2-ac260.patch # Features/functional changes Patch20: httpd-2.0.48-release.patch Patch21: httpd-2.0.40-xfsz.patch @@ -109,6 +110,7 @@ Security (TLS) protocols. %patch3 -p1 -b .deplibs %patch4 -p1 -b .disablemods %patch5 -p1 -b .layout +%patch6 -p1 -b .ac260 %patch21 -p0 -b .xfsz %patch22 -p1 -b .pod @@ -479,7 +481,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/httpd/build/*.sh %changelog -* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - (none):2.2.2-5.1 +* Wed Jul 19 2006 Joe Orton <jorton@redhat.com> 2.2.2-7 +- fix "apxs -g"-generated Makefile +- fix buildconf with autoconf 2.60 + +* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.2.2-5.1 - rebuild * Wed Jun 7 2006 Joe Orton <jorton@redhat.com> 2.2.2-5 |