[packages/js-webapps-common] - migrated to apache 2.4

baggins baggins at pld-linux.org
Wed May 15 20:38:39 CEST 2013


commit 6ad74a6fab23f3b4d0d1ed9df5f27e51bc339464
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 20:38:37 2013 +0200

    - migrated to apache 2.4

 httpd.conf             | 5 +++++
 js-webapps-common.spec | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/js-webapps-common.spec b/js-webapps-common.spec
index 4b5cb90..c48b899 100644
--- a/js-webapps-common.spec
+++ b/js-webapps-common.spec
@@ -1,11 +1,12 @@
 Summary:	Common dirs and webserver aliases for JavaScript libraries
 Name:		js-webapps-common
 Version:	1.0
-Release:	1
+Release:	2
 License:	GPL
 Group:		Base
 Source1:	apache.conf
 Source2:	lighttpd.conf
+Source3:	httpd.conf
 BuildRequires:	rpmbuild(macros) >= 1.461
 Requires:	webapps
 Requires:	webserver(access)
@@ -29,7 +30,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 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
@@ -40,10 +41,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..689f157
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,5 @@
+Alias /js/ /usr/share/js/
+<Directory /usr/share/js/>
+	Require all granted
+	Options +FollowSymLinks
+</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/js-webapps-common.git/commitdiff/6ad74a6fab23f3b4d0d1ed9df5f27e51bc339464



More information about the pld-cvs-commit mailing list