[packages/js-plupload] - migrated to apache 2.4

[baggins]

commit 670c566f5cd46eb28ca72e718182092a03795fbe
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 20:33:32 2013 +0200

    - migrated to apache 2.4

 httpd.conf       |  4 ++++
 js-plupload.spec | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/js-plupload.spec b/js-plupload.spec
index 7a0de9f..4ad4109 100644
--- a/js-plupload.spec
+++ b/js-plupload.spec
@@ -3,19 +3,21 @@
 Summary:	Multiple file upload utility using Flash, Silverlight, Google Gears, HTML5 or BrowserPlus
 Name:		js-%{plugin}
 Version:	1.5.3
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	https://github.com/downloads/moxiecode/plupload/plupload_%{ver}.zip
 # Source0-md5:	7cbc00bbf7b42a995cb84b6a6539b0cb
 Source1:	apache.conf
 Source2:	lighttpd.conf
+Source3:	httpd.conf
 URL:		http://www.plupload.com/
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	unzip
 Requires:	webapps
 Requires:	webserver(access)
 Suggests:	jquery
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,7 +55,7 @@ cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,10 +66,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
diff --git a/httpd.conf b/httpd.conf
new file mode 100644
index 0000000..e532626
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,4 @@
+Alias /js/plupload /usr/share/plupload
+<Directory /usr/share/plupload>
+	Require all granted
+</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/js-plupload.git/commitdiff/670c566f5cd46eb28ca72e718182092a03795fbe