summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2013-01-27 16:55:22 +0000
committerGraham Leggett <minfrin@apache.org>2013-01-27 16:55:22 +0000
commit15da55b2f74fb3261fd6fda5362f1a965b184d4d (patch)
treec2f391d0334a2c2b1bcebd533556b78ee2980809 /build
parent4361631ed956413b7a4a458132fb111123bbb52b (diff)
downloadhttpd-15da55b2f74fb3261fd6fda5362f1a965b184d4d.tar.gz
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
Diffstat (limited to 'build')
-rw-r--r--build/rpm/httpd.spec.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index 83b1533e2f..c0ba1439e7 100644
--- 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