commit 4502e6875d003c6f252b77251e79a4d23d3d4508
Author: Jan Rękorajski <[email protected]>
Date: Wed May 15 20:30:53 2013 +0200
- migrated to apache 2.4
httpd.conf | 5 +++++
js-klass.spec | 10 ++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/js-klass.spec b/js-klass.spec
index facff04..61de558 100644
--- a/js-klass.spec
+++ b/js-klass.spec
@@ -2,18 +2,20 @@
Summary: Class provider with classical inheritance interface
Name: js-%{pkg}
Version: 1.2.2
-Release: 2
+Release: 3
License: MIT
Group: Applications/WWW
Source0:
https://github.com/ded/klass/tarball/master/%{pkg}-%{version}.tgz
# Source0-md5: 82df3cdf7b1a0f468f2bb5e4d48fa6c6
Source1: apache.conf
Source2: lighttpd.conf
+Source3: httpd.conf
URL: http://www.dustindiaz.com/klass
BuildRequires: rpmbuild(macros) >= 1.461
Requires: webapps
Requires: webserver(access)
Requires: webserver(alias)
+Conflicts: apache-base < 2.4.0-1
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,7 +41,7 @@ ln -s %{pkg}-%{version}.min.js
$RPM_BUILD_ROOT%{_appdir}/%{pkg}.js
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
@@ -50,10 +52,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..4541544
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,5 @@
+Alias /js/klass /usr/share/js-klass
+<Directory /usr/share/js-klass>
+ Require all granted
+ Options +FollowSymLinks
+</Directory>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/js-klass.git/commitdiff/4502e6875d003c6f252b77251e79a4d23d3d4508
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
