[httpd] really fix restart
jorton
jorton at fedoraproject.org
Fri Apr 20 12:10:20 UTC 2012
commit b4edcbb8cb56c9143ddb270db301524805cffd7e
Author: Joe Orton <jorton at redhat.com>
Date: Fri Apr 20 13:10:10 2012 +0100
really fix restart
Resolves: rhbz#814645
httpd.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/httpd.spec b/httpd.spec
index a41c80f..c59c9b1 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -45,6 +45,8 @@ Patch23: httpd-2.4.1-export.patch
Patch24: httpd-2.4.1-corelimit.patch
Patch25: httpd-2.4.1-selinux.patch
Patch26: httpd-2.4.1-suenable.patch
+# Bug fixes
+Patch40: httpd-2.4.2-restart.patch
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -152,6 +154,8 @@ authentication to the Apache HTTP Server.
%patch25 -p1 -b .selinux
%patch26 -p1 -b .suenable
+%patch40 -p1 -b .restart
+
# Patch in vendor/release string
sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -554,6 +558,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd
%changelog
+* Fri Apr 20 2012 Joe Orton <jorton at redhat.com> - 2.4.2-3
+- really fix restart
+
* Fri Apr 20 2012 Joe Orton <jorton at redhat.com> - 2.4.2-2
- tweak default ssl.conf
- fix restart handling (#814645)
More information about the scm-commits
mailing list