Backport r1439114:

rpm: Bump the epoch on mod_proxy_html so that older separately packaged
versions of mod_proxy_html don't take precedence over us.

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

diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index 83b1533e2f99a4047cf2e5e08093a9deb102def5..c0ba1439e74764c9ec7d059e783a4ff366082560 100644 (file)
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -87,8 +87,9 @@ extended with scripts written in the Lua programming language.
 %package -n mod_proxy_html
 Group: System Environment/Daemons
 Summary: Proxy HTML filter modules for the Apache HTTP server
+Epoch: 1
 BuildRequires: libxml2-devel
-Requires: httpd = %{version}-%{release}, httpd-mmn = %{mmn}
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
 
 %description -n mod_proxy_html
 The mod_proxy_html module for the Apache HTTP server provides