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

[glen]

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

    Revert "- migrated to apache 2.4"
    
    This reverts commit 92fadca6f0100585dd15521e0580842a84c66096.

 js-fileuploader.spec | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/js-fileuploader.spec b/js-fileuploader.spec
index e356c96..6a430c4 100644
--- 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:	3
+Release:	2
 License:	MIT, GPL v2 or LGPL v2
 Group:		Applications/WWW
 Source0:	https://github.com/downloads/valums/file-uploader/%{version}.zip
@@ -15,7 +15,6 @@ 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)
 
@@ -48,7 +47,7 @@ Demonstrations and samples for %{plugin}.
 %prep
 %setup -qc
 
-# Apache1 config
+# Apache1/Apache2 config
 cat > apache.conf <<'EOF'
 Alias /js/%{plugin} %{_appdir}
 <Directory %{_appdir}>
@@ -57,15 +56,6 @@ 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 += (
@@ -103,7 +93,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 httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
@@ -115,10 +105,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-fileuploader.git/commitdiff/45c0571a571ab28c7b7cdb12938026aa8ecd46f8