From: Jim Jagielski <jim@apache.org>
Date: Wed, 5 Jul 2017 11:51:18 +0000 (+0000)
Subject: Merge r1800788 from trunk:
X-Git-Tag: 2.4.27~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da0ed33b925e9fd5141a0587d447076d344618ca;p=apache

Merge r1800788 from trunk:

Add mod_proxy_hcheck to generated httpd.spec file.  PR 60506.


Submitted by: ylavic
Reviewed by: ylavic, rpluem, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1800862 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index f7c489262c..695492f5b6 100644
--- a/STATUS
+++ b/STATUS
@@ -115,10 +115,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   *) httpd.spec: Add mod_proxy_hcheck.
-      trunk patch: http://svn.apache.org/r1800788
-      2.4.x patch: svn merge -c 1800788 ^/httpd/httpd/trunk .
-      +1: ylavic, rpluem, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index 271fc5c51a..540ad0930f 100644
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -383,6 +383,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/modules/mod_proxy_http.so
 %{_libdir}/httpd/modules/mod_proxy_scgi.so
 %{_libdir}/httpd/modules/mod_proxy_wstunnel.so
+%{_libdir}/httpd/modules/mod_proxy_hcheck.so
 %{_libdir}/httpd/modules/mod_proxy.so
 %{_libdir}/httpd/modules/mod_ratelimit.so
 %{_libdir}/httpd/modules/mod_reflector.so