From 793537f0f6d8414f5f06c6b471e8c0e69637c607 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 1 May 2012 18:32:41 +0200
Subject: httpd-2.4.2-7: sync with rawhide

---
 httpd.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'httpd.spec')

diff --git a/httpd.spec b/httpd.spec
index 9d9944f..4b840be 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -48,6 +48,7 @@ Patch26: httpd-2.4.1-suenable.patch
 Patch40: httpd-2.4.2-restart.patch
 Patch41: httpd-2.4.2-r1327036+.patch
 Patch42: httpd-2.4.2-r1326980+.patch
+Patch43: httpd-2.4.2-r1332643.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -157,6 +158,7 @@ authentication to the Apache HTTP Server.
 %patch40 -p1 -b .restart
 %patch41 -p1 -b .r1327036+
 %patch42 -p1 -b .r1326980+
+%patch43 -p1 -b .r1332643
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -560,6 +562,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Tue May  1 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.4.2-7
+- sync with rawhide, rebuild for remi repo
+
+* Tue May  1 2012 Joe Orton <jorton@redhat.com> - 2.4.2-7
+- mod_ssl: add TLS NPN support (r1332643, #809599)
+
 * Tue May  1 2012 Joe Orton <jorton@redhat.com> - 2.4.2-6
 - add BR on APR >= 1.4.0
 
-- 
cgit