[packages/php-eaccelerator] Revert "- migrated to apache 2.4"

glen glen at pld-linux.org
Tue Apr 29 08:35:16 CEST 2014


commit 00e7a267f6552a9bf6a9be30997916d6d0824f2c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Apr 29 09:31:54 2014 +0300

    Revert "- migrated to apache 2.4"
    
    This reverts commit 1d65fe6e38181b231ba63a24887609dfd5a32800.
    
    Conflicts:
    	php-eaccelerator.spec

 php-eaccelerator.spec | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/php-eaccelerator.spec b/php-eaccelerator.spec
index 11225a4..bbcd575 100644
--- a/php-eaccelerator.spec
+++ b/php-eaccelerator.spec
@@ -44,7 +44,6 @@ Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	webapps
 Requires:	webserver(php)
-Conflicts:	apache-base < 2.4.0-1
 
 %description webinterface
 PHP Accelerator can be managed through web interface script
@@ -74,13 +73,6 @@ Alias /%{_webapp} %{_appdir}
 </Directory>
 EOF
 
-cat > httpd.conf <<EOF
-Alias /%{_webapp} %{_appdir}
-<Directory %{_appdir}/>
-	Require local
-</Directory>
-EOF
-
 %build
 phpize
 %configure \
@@ -113,10 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun webinterface -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin webinterface -- apache-base
+%triggerin webinterface -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun webinterface -- apache-base
+%triggerun webinterface -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %post
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-eaccelerator.git/commitdiff/d48a00fd323f4b87782fe8c9dce5f7d7a54a2036



More information about the pld-cvs-commit mailing list