Revert "- migrated to apache 2.4"

This reverts commit 63b5da5b07dfbd8ef94c1eb5f36451a2a42befea.

diff --git a/php-xcache.spec b/php-xcache.spec
index 51860f125c73d640ebff5e6318fde7d4609ea56a..c8c531c73fb47a790f417dc4f85166cc1b17c677 100644 (file)
--- a/php-xcache.spec
+++ b/php-xcache.spec
@@ -6,14 +6,13 @@ Summary:      %{modname} - PHP opcode cacher
 Summary(pl.UTF-8):     %{modname} - buforowanie opcodów PHP
 Name:          %{php_name}-%{modname}
 Version:       3.0.1
-Release:       2
+Release:       1
 License:       BSD
 Group:         Development/Languages/PHP
 Source0:       http://xcache.lighttpd.net/pub/Releases/%{version}/xcache-%{version}.tar.bz2
 # Source0-md5: 45086010bc4f82f506c08be1c556941b
 Source1:       %{modname}-apache.conf
 Source2:       %{modname}-lighttpd.conf
-Source3:       %{modname}-httpd.conf
 Patch0:                config.patch
 URL:           http://xcache.lighttpd.net/
 BuildRequires: %{php_name}-devel >= 4:5.2.17-8
@@ -43,7 +42,6 @@ Group:                Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      webapps
 Requires:      webserver(php) >= 5.0
-Conflicts:     apache-base < 2.4.0-1
 
 %description web
 Via this web interface script you can manage and view statistics of
@@ -103,7 +101,7 @@ ln -s %{_sysconfdir}/config.php $RPM_BUILD_ROOT%{_appdir}/config.php
 ln -s %{_sysconfdir}/cacher.config.php $RPM_BUILD_ROOT%{_appdir}/cacher/config.php
 ln -s %{_sysconfdir}/coverager.config.php $RPM_BUILD_ROOT%{_appdir}/coverager/config.php
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
@@ -126,10 +124,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

diff --git a/xcache-httpd.conf b/xcache-httpd.conf
deleted file mode 100644 (file)
index 27f928c..0000000
--- a/xcache-httpd.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# allow from localhost
-#
-# NOTE: you should set xcache.admin.user and xcache.admin.pass php.ini settings
-# to access it.
-
-Alias /xcache /usr/share/xcache
-<Directory /usr/share/xcache>
-       Require local
-</Directory>