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

[glen]

commit 930fcc156de02db1c727be6bf9772d0072e9b2b7
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Aug 27 17:09:43 2013 +0300

    Revert "- migrated to apache 2.4"
    
    This reverts commit 4e8e3b138bf22db4ee69307930a7d20685ba7148.

 httpd.conf        |  5 -----
 js-swfupload.spec | 10 ++++------
 2 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/js-swfupload.spec b/js-swfupload.spec
index ec57410..39f1df1 100644
--- a/js-swfupload.spec
+++ b/js-swfupload.spec
@@ -3,14 +3,13 @@
 Summary:	JavaScript & Flash Upload Library
 Name:		js-%{plugin}
 Version:	2.2.0.1
-Release:	2
+Release:	1
 License:	MIT
 Group:		Applications/WWW
 Source0:	https://swfupload.googlecode.com/files/SWFUpload%20v%{version}%20Core.zip?/SWFUpload_v%{version}_Core.zip
 # Source0-md5:	1bf14f5a7a9a3ecc529378ee50f0c59b
 Source1:	apache.conf
 Source2:	lighttpd.conf
-Source3:	httpd.conf
 URL:		https://code.google.com/p/swfupload/
 BuildRequires:	closure-compiler
 BuildRequires:	js
@@ -18,7 +17,6 @@ BuildRequires:	rpmbuild(macros) >= 1.553
 BuildRequires:	unzip
 Requires:	webapps
 Requires:	webserver(alias)
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -82,7 +80,7 @@ ln -s %{plugin}-%{version}.min.js $RPM_BUILD_ROOT%{_appdir}/%{plugin}.js
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,10 +91,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
diff --git a/httpd.conf b/httpd.conf
deleted file mode 100644
index 824ee46..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-Alias /js/swfupload/ /usr/share/swfupload/
-<Directory /usr/share/swfupload>
-	Require all granted
-	Options +FollowSymLinks
-</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/js-swfupload.git/commitdiff/7c3d86f33fa34883764ea191d3c013df7313f956