From: Graham Leggett <minfrin@apache.org>
Date: Mon, 26 Feb 2018 13:26:50 +0000 (+0000)
Subject: Backport 1825368:
X-Git-Tag: 2.4.31~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a602b27fe17537ffd65641ed3117ad4014c551ca;p=apache

Backport 1825368:
rpm: Remove rpm build for mod_socache_dc, the dependency distcache has long since
stopped being available in RPM distros.


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

diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index 540ad0930f..bfcaa0c202 100644
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -97,16 +97,6 @@ a filter to rewrite HTML links within web content when used within
 a reverse proxy environment. The mod_xml2enc module provides
 enhanced charset/internationalisation support for mod_proxy_html.
 
-%package -n mod_socache_dc
-Group: System Environment/Daemons
-Summary: Distcache shared object cache module for the Apache HTTP server
-BuildRequires: distcache-devel
-Requires: httpd = %{version}-%{release}, httpd-mmn = %{mmn}
-
-%description -n mod_socache_dc
-The mod_socache_dc module for the Apache HTTP server allows the shared
-object cache to use the distcache shared caching mechanism.
-
 %package -n mod_ssl
 Group: System Environment/Daemons
 Summary: SSL/TLS module for the Apache HTTP server
@@ -156,7 +146,7 @@ rm -rf srclib/{apr,apr-util,pcre}
         --enable-pie \
         --with-pcre \
         --enable-mods-shared=all \
-        --enable-ssl --with-ssl --enable-socache-dc --enable-bucketeer \
+        --enable-ssl --with-ssl --enable-bucketeer \
         --enable-case-filter --enable-case-filter-in \
         --disable-imagemap
 
@@ -475,10 +465,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/modules/mod_proxy_html.so
 %{_libdir}/httpd/modules/mod_xml2enc.so
 
-%files -n mod_socache_dc
-%defattr(-,root,root)
-%{_libdir}/httpd/modules/mod_socache_dc.so
-
 %files -n mod_ssl
 %defattr(-,root,root)
 %{_libdir}/httpd/modules/mod_ssl.so