packages: js-klass/js-klass.spec, js-klass/apache.conf (NEW), js-klass/ligh...

[glen]

Author: glen                         Date: Wed Apr 11 13:00:50 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move webserver configs to separate files

---- Files affected:
packages/js-klass:
   js-klass.spec (1.3 -> 1.4) , apache.conf (NONE -> 1.1)  (NEW), lighttpd.conf (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/js-klass/js-klass.spec
diff -u packages/js-klass/js-klass.spec:1.3 packages/js-klass/js-klass.spec:1.4
--- packages/js-klass/js-klass.spec:1.3	Mon Jan 23 11:32:07 2012
+++ packages/js-klass/js-klass.spec	Wed Apr 11 15:00:44 2012
@@ -3,11 +3,13 @@
 Summary:	Class provider with classical inheritance interface
 Name:		js-%{pkg}
 Version:	1.2.2
-Release:	1
+Release:	2
 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
 URL:		http://www.dustindiaz.com/klass
 BuildRequires:	rpmbuild(macros) >= 1.461
 Requires:	webapps
@@ -29,21 +31,6 @@
 %setup -qc
 mv *-%{pkg}-*/* .
 
-# apache1/apache2 conf
-cat > apache.conf <<'EOF'
-Alias /js/klass %{_appdir}
-<Directory %{_appdir}>
-	Allow from all
-</Directory>
-EOF
-
-# lighttpd conf
-cat > lighttpd.conf <<'EOF'
-alias.url += (
-    "/js/klass" => "%{_appdir}",
-)
-EOF
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
@@ -51,9 +38,9 @@
 cp -p %{pkg}.min.js $RPM_BUILD_ROOT%{_appdir}/%{pkg}-%{version}.min.js
 ln -s %{pkg}-%{version}.min.js $RPM_BUILD_ROOT%{_appdir}/%{pkg}.js
 
-cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -a lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2012/04/11 13:00:44  glen
+- move webserver configs to separate files
+
 Revision 1.3  2012/01/23 10:32:07  glen
 - use trunk version: 1.2.2
 

================================================================
Index: packages/js-klass/apache.conf
diff -u /dev/null packages/js-klass/apache.conf:1.1
--- /dev/null	Wed Apr 11 15:00:50 2012
+++ packages/js-klass/apache.conf	Wed Apr 11 15:00:44 2012
@@ -0,0 +1,4 @@
+Alias /js/klass /usr/share/js-klass
+<Directory /usr/share/js-klass>
+	Allow from all
+</Directory>

================================================================
Index: packages/js-klass/lighttpd.conf
diff -u /dev/null packages/js-klass/lighttpd.conf:1.1
--- /dev/null	Wed Apr 11 15:00:50 2012
+++ packages/js-klass/lighttpd.conf	Wed Apr 11 15:00:44 2012
@@ -0,0 +1,3 @@
+alias.url += (
+    "/js/klass" => "/usr/share/js-klass",
+)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/js-klass/js-klass.spec?r1=1.3&r2=1.4