- migrated to apache 2.4

diff --git a/jquery-thickbox.spec b/jquery-thickbox.spec
index 9d47bb58a05cc7cf5d7f14c1af6f6c7108f34b93..b27f1ad425d6dc17602f122531eec24f0c750e71 100644 (file)
--- a/jquery-thickbox.spec
+++ b/jquery-thickbox.spec
@@ -5,7 +5,7 @@
 Summary:       ThickBox
 Name:          jquery-thickbox
 Version:       3.1
-Release:       12
+Release:       13
 License:       MIT / GPL
 Group:         Applications/WWW
 Source0:       http://jquery.com/demo/thickbox/thickbox-code/thickbox.js
@@ -29,6 +29,7 @@ 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)
 
@@ -57,7 +58,7 @@ cp -a %{SOURCE3} .
 %patch4 -p1
 %patch5 -p1
 
-# Apache 1.3 / Apache 2.x config
+# Apache 1.3
 cat > apache.conf <<'EOF'
 Alias /js/thickbox %{_appdir}
 <Directory %{_appdir}>
@@ -65,6 +66,14 @@ 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 += (
@@ -95,7 +104,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 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
 for a in $RPM_BUILD_ROOT%{_appdir}/*; do
        ln -s %{_appdir}/$(basename $a) $RPM_BUILD_ROOT%{_legacydir}
@@ -112,10 +121,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