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

[baggins]

commit 3303d228390cf500e2233ac0a381c4037b20c83c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 20:32:19 2013 +0200

    - migrated to apache 2.4

 httpd.conf    |  4 ++++
 js-phpjs.spec | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/js-phpjs.spec b/js-phpjs.spec
index 81ccf17..5b6ca05 100644
--- a/js-phpjs.spec
+++ b/js-phpjs.spec
@@ -2,13 +2,14 @@ Summary:	Use PHP functions in JavaScript
 Name:		js-phpjs
 # there seems not to be any unified version
 Version:	0.1
-Release:	1
+Release:	2
 License:	GPL, MIT
 Group:		Applications/WWW
 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
@@ -16,6 +17,7 @@ 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)
 
@@ -58,7 +60,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 $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,10 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd
diff --git a/httpd.conf b/httpd.conf
new file mode 100644
index 0000000..5d57fe8
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,4 @@
+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/3303d228390cf500e2233ac0a381c4037b20c83c