[packages/js-fileuploader] - migrated to apache 2.4
baggins
baggins at pld-linux.org
Wed May 15 20:28:22 CEST 2013
commit 92fadca6f0100585dd15521e0580842a84c66096
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed May 15 20:28:20 2013 +0200
- migrated to apache 2.4
js-fileuploader.spec | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/js-fileuploader.spec b/js-fileuploader.spec
index 6a430c4..e356c96 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: 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/js-fileuploader.git/commitdiff/92fadca6f0100585dd15521e0580842a84c66096
More information about the pld-cvs-commit
mailing list