summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorton <jorton@fedoraproject.org>2008-01-28 11:19:20 +0000
committerjorton <jorton@fedoraproject.org>2008-01-28 11:19:20 +0000
commit7ffd00c3d3db25e61865284716a2645328b0aa38 (patch)
treec5769316a22e659cde1aa2bb9b4e4f137b0f4cc5
parent87085d25c177d5a8891e66b2767a4eda98f55bec (diff)
downloadhttpd-7ffd00c3d3db25e61865284716a2645328b0aa38.tar.gz
httpd-7ffd00c3d3db25e61865284716a2645328b0aa38.tar.xz
httpd-7ffd00c3d3db25e61865284716a2645328b0aa38.zip
- update to 2.2.8 (#430465)httpd-2_2_8-1_fc8
-rw-r--r--httpd.spec12
-rw-r--r--sources2
2 files changed, 6 insertions, 8 deletions
diff --git a/httpd.spec b/httpd.spec
index 5933af7..c320d87 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -5,8 +5,8 @@
Summary: Apache HTTP Server
Name: httpd
-Version: 2.2.6
-Release: 3
+Version: 2.2.8
+Release: 1%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -36,7 +36,6 @@ Patch25: httpd-2.0.54-selinux.patch
# Bug fixes
Patch54: httpd-2.2.0-authnoprov.patch
Patch55: httpd-2.2.4-oldflush.patch
-Patch56: httpd-2.2.6-ssllibver.patch
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -124,7 +123,6 @@ Security (TLS) protocols.
%patch54 -p1 -b .authnoprov
%patch55 -p1 -b .oldflush
-%patch56 -p1 -b .ssllibver
# Patch in vendor/release string
sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -146,9 +144,6 @@ rm -rf srclib/{apr,apr-util,pcre}
# regenerate configure scripts
autoheader && autoconf || exit 1
-# Limit size of CHANGES to recent history
-echo '1,/Changes with Apache 2.0/wq' | ed CHANGES
-
# Before configure; fix location of build dir in generated apxs
%{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
support/apxs.in
@@ -479,6 +474,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh
%changelog
+* Mon Jan 28 2008 Joe Orton <jorton@redhat.com> 2.2.8-1.fc8
+- update to 2.2.8 (#430465)
+
* Mon Sep 17 2007 Joe Orton <jorton@redhat.com> 2.2.6-3
- add fix for SSL library string regression (PR 43334)
- use powered-by logo from system-logos (#250676)
diff --git a/sources b/sources
index 0c17cc7..b9b71ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d050a49bd7532ec21c6bb593b3473a5d httpd-2.2.6.tar.gz
+39a755eb0f584c279336387b321e3dfc httpd-2.2.8.tar.gz