commit 4e8e3b138bf22db4ee69307930a7d20685ba7148
Author: Jan Rękorajski <[email protected]>
Date: Wed May 15 20:36:39 2013 +0200
- migrated to apache 2.4
httpd.conf | 5 +++++
js-swfupload.spec | 10 ++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/js-swfupload.spec b/js-swfupload.spec
index 39f1df1..ec57410 100644
--- a/js-swfupload.spec
+++ b/js-swfupload.spec
@@ -3,13 +3,14 @@
Summary: JavaScript & Flash Upload Library
Name: js-%{plugin}
Version: 2.2.0.1
-Release: 1
+Release: 2
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
@@ -17,6 +18,7 @@ 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)
@@ -80,7 +82,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 $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -91,10 +93,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..824ee46
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,5 @@
+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/4e8e3b138bf22db4ee69307930a7d20685ba7148
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
