[packages/js-phpjs] Revert "- migrated to apache 2.4"

[glen]

commit bb18463e073a83a527b8dd3793b99b84e8a32868
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Aug 27 17:14:02 2013 +0300

    Revert "- migrated to apache 2.4"
    
    This reverts commit 3303d228390cf500e2233ac0a381c4037b20c83c.
    
    Conflicts:
    	js-phpjs.spec

 httpd.conf    | 4 ----
 js-phpjs.spec | 8 +++-----
 2 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/js-phpjs.spec b/js-phpjs.spec
index 68fe8f9..8136ca2 100644
--- a/js-phpjs.spec
+++ b/js-phpjs.spec
@@ -9,7 +9,6 @@ Source0:	https://github.com/kvz/phpjs/tarball/master/%{name}.tgz
 # Source0-md5:	1a6fa88ed91ba6ee1f36d5729f6b8470
 Source1:	apache.conf
 Source2:	lighttpd.conf
-Source3:	httpd.conf
 URL:		http://www.phpjs.org/
 BuildRequires:	js
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -17,7 +16,6 @@ BuildRequires:	unzip
 BuildRequires:	yuicompressor
 Requires:	webserver(access)
 Requires:	webserver(alias)
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,7 +58,7 @@ cp -a build/functions/* $RPM_BUILD_ROOT%{_appdir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,10 +69,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache-base
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache-base
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd
diff --git a/httpd.conf b/httpd.conf
deleted file mode 100644
index 5d57fe8..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-Alias /js/phpjs/ /usr/share/phpjs/
-<Directory /usr/share/phpjs>
-	Require all granted
-</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/js-phpjs.git/commitdiff/70fcfd5909d9a998c8ccbaa59bcc57f0a1d3dead