[packages/jquery-thickbox] Revert "- migrated to apache 2.4"

[glen]

commit 70d5b2231e35bc815e5bb65d6f4c127585a03e41
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Aug 27 17:07:51 2013 +0300

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

 jquery-thickbox.spec | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/jquery-thickbox.spec b/jquery-thickbox.spec
index b27f1ad..9d47bb5 100644
--- a/jquery-thickbox.spec
+++ b/jquery-thickbox.spec
@@ -5,7 +5,7 @@
 Summary:	ThickBox
 Name:		jquery-thickbox
 Version:	3.1
-Release:	13
+Release:	12
 License:	MIT / GPL
 Group:		Applications/WWW
 Source0:	http://jquery.com/demo/thickbox/thickbox-code/thickbox.js
@@ -29,7 +29,6 @@ BuildRequires:	yuicompressor
 Requires:	jquery >= 1.2.6-2
 Requires:	webapps
 Requires:	webserver(alias)
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -58,7 +57,7 @@ cp -a %{SOURCE3} .
 %patch4 -p1
 %patch5 -p1
 
-# Apache 1.3
+# Apache 1.3 / Apache 2.x config
 cat > apache.conf <<'EOF'
 Alias /js/thickbox %{_appdir}
 <Directory %{_appdir}>
@@ -66,14 +65,6 @@ Alias /js/thickbox %{_appdir}
 </Directory>
 EOF
 
-# Apache 2.4 config
-cat > httpd.conf <<'EOF'
-Alias /js/thickbox %{_appdir}
-<Directory %{_appdir}>
-	Require all granted
-</Directory>
-EOF
-
 # lighttpd conf
 cat > lighttpd.conf <<'EOF'
 alias.url += (
@@ -104,7 +95,7 @@ cp -a build/* $RPM_BUILD_ROOT%{_appdir}
 %if %{with legacy}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_legacydir}}
 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
 for a in $RPM_BUILD_ROOT%{_appdir}/*; do
 	ln -s %{_appdir}/$(basename $a) $RPM_BUILD_ROOT%{_legacydir}
@@ -121,10 +112,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/jquery-thickbox.git/commitdiff/51d1ca77df1d585c0104bf05b44a58ca590f7123