- migrated to apache 2.4

diff --git a/js-fileuploader.spec b/js-fileuploader.spec
index 6a430c4af9e3ff639841774f93405a0ad6217451..e356c96849c3b6860fbda9da042251ed0c8fe5a7 100644 (file)
--- a/js-fileuploader.spec
+++ b/js-fileuploader.spec
@@ -2,7 +2,7 @@
 Summary:       Multiple file upload plugin with progress-bar, drag-and-drop
 Name:          js-%{plugin}
 Version:       2.0
-Release:       2
+Release:       3
 License:       MIT, GPL v2 or LGPL v2
 Group:         Applications/WWW
 Source0:       https://github.com/downloads/valums/file-uploader/%{version}.zip
@@ -15,6 +15,7 @@ BuildRequires:        yuicompressor
 Requires:      webserver(access)
 Requires:      webserver(alias)
 #Obsoletes:    js-ajax-upload
+Conflicts:     apache-base < 2.4.0-1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,7 +48,7 @@ Demonstrations and samples for %{plugin}.
 %prep
 %setup -qc
 
-# Apache1/Apache2 config
+# Apache1 config
 cat > apache.conf <<'EOF'
 Alias /js/%{plugin} %{_appdir}
 <Directory %{_appdir}>
@@ -56,6 +57,15 @@ Alias /js/%{plugin} %{_appdir}
 </Directory>
 EOF
 
+# Apache2 config
+cat > httpd.conf <<'EOF'
+Alias /js/%{plugin} %{_appdir}
+<Directory %{_appdir}>
+       Require all granted
+       Options +FollowSymLinks
+</Directory>
+EOF
+
 # lighttpd config
 cat > lighttpd.conf <<'EOF'
 alias.url += (
@@ -93,7 +103,7 @@ cp -a *.htm $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
@@ -105,10 +115,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