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

[baggins]

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

    - migrated to apache 2.4

 js-easyxdm.spec | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/js-easyxdm.spec b/js-easyxdm.spec
index 64dc676..eadaac0 100644
--- a/js-easyxdm.spec
+++ b/js-easyxdm.spec
@@ -2,7 +2,7 @@ Summary:	jQuery JavaScript Library
 Summary(pl.UTF-8):	Biblioteka JavaScriptu jQuery
 Name:		js-easyxdm
 Version:	2.4.11.104
-Release:	1
+Release:	2
 License:	MIT
 Group:		Applications/WWW
 Source0:	https://github.com/downloads/oyvindkinsey/easyXDM/easyXDM-%{version}.zip
@@ -14,6 +14,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)
 
@@ -31,7 +32,7 @@ API's across domain boundaries.
 %prep
 %setup -qc
 
-# Apache1/Apache2 config
+# Apache1 config
 cat > apache.conf <<'EOF'
 Alias /js/easyXDM/ %{_appdir}/
 <Directory %{_appdir}>
@@ -39,6 +40,14 @@ Alias /js/easyXDM/ %{_appdir}/
 </Directory>
 EOF
 
+# Apache2 config
+cat > httpd.conf <<'EOF'
+Alias /js/easyXDM/ %{_appdir}/
+<Directory %{_appdir}>
+	Require all granted
+</Directory>
+EOF
+
 # Lighttpd config
 cat > lighttpd.conf <<'EOF'
 alias.url += (
@@ -60,7 +69,7 @@ cp -p build/easyXDM.js $RPM_BUILD_ROOT%{_appdir}
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -a lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
@@ -72,10 +81,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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/js-easyxdm.git/commitdiff/19fa16e458c25e4b71fb49c26da520215e73000a