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

[glen]

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

    Revert "- migrated to apache 2.4"
    
    This reverts commit ae3e22ad44c48dfab6ec956711fdce2b53605184.

 js-json2.spec | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/js-json2.spec b/js-json2.spec
index d39105b..e000571 100644
--- a/js-json2.spec
+++ b/js-json2.spec
@@ -1,7 +1,7 @@
 Summary:	JSON in JavaScript
 Name:		js-json2
 Version:	20100320
-Release:	2
+Release:	1
 License:	Public Domain
 Group:		Applications/WWW
 Source0:	http://www.JSON.org/json2.js
@@ -12,7 +12,6 @@ BuildRequires:	jsmin
 Requires:	webapps
 Requires:	webserver(access)
 Requires:	webserver(alias)
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,7 +33,7 @@ if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
 	exit 1
 fi
 
-# apache1 conf
+# apache1/apache2 conf
 cat > apache.conf <<'EOF'
 Alias /js/json2.js %{_appdir}/json2.js
 <Directory %{_appdir}>
@@ -42,14 +41,6 @@ Alias /js/json2.js %{_appdir}/json2.js
 </Directory>
 EOF
 
-# apache2 conf
-cat > httpd.conf <<'EOF'
-Alias /js/json2.js %{_appdir}/json2.js
-<Directory %{_appdir}>
-	Require all granted
-</Directory>
-EOF
-
 # lighttpd conf
 cat > lighttpd.conf <<'EOF'
 alias.url += (
@@ -68,7 +59,7 @@ cp -a json2-min.js $RPM_BUILD_ROOT%{_appdir}/json2.js
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -a lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
@@ -80,10 +71,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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/js-json2.git/commitdiff/4560026c1aa1c1cf72b27b69b5f974acec4ee42b