Revert "- migrated to apache 2.4"

This reverts commit 05ce7ff532b3b9f83909d582bc9ef375cb81c7cf.

Conflicts:
	php-pecl-memcache.spec

diff --git a/memcache-httpd.conf b/memcache-httpd.conf
deleted file mode 100644 (file)
index bf3ddb1..0000000
--- a/memcache-httpd.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Alias /memcache.php /usr/share/memcache/memcache.php
-
-<Directory /usr/share/memcache>
-       # Allow from localhost only.
-       # IMPORTANT: if you allow from elsewhere, be sure to change admin
-       # username/password in config.php otherwise you make your page password easily
-       # guessable.
-       Require local
-</Directory>

diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 2f4b04fc8f4faf37114e1e56816e9f24cc3f2953..cdd39b2f78e7fb237cf726063cabd3831e7ab6eb 100644 (file)
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -15,7 +15,6 @@ Source1:      %{modname}.ini
 Source2:       %{modname}-apache.conf
 Source3:       %{modname}-lighttpd.conf
 Source4:       config.php
-Source5:       %{modname}-httpd.conf
 Patch0:                %{modname}-webapp.patch
 URL:           http://pecl.php.net/package/memcache/
 BuildRequires: %{php_name}-devel >= 3:5.0.0
@@ -67,7 +66,6 @@ Requires:     php(gd)
 Requires:      php(pcre)
 Requires:      webapps
 Requires:      webserver(php) >= 5.0
-Conflicts:     apache-base < 2.4.0-1
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
@@ -100,8 +98,8 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 cp -a memcache.php $RPM_BUILD_ROOT%{_appdir}
 cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/config.php
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -a $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,10 +126,10 @@ fi
 %triggerun web -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin web -- apache-base
+%triggerin web -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun web -- apache-base
+%triggerun web -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin web -- lighttpd