packages: jquery/jquery.spec, jquery/apache.conf (NEW), jquery/lighttpd.con...

[glen]

Author: glen                         Date: Thu Feb  9 14:21:57 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move webserver config to separate files

---- Files affected:
packages/jquery:
   jquery.spec (1.29 -> 1.30) , apache.conf (NONE -> 1.1)  (NEW), lighttpd.conf (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/jquery/jquery.spec
diff -u packages/jquery/jquery.spec:1.29 packages/jquery/jquery.spec:1.30
--- packages/jquery/jquery.spec:1.29	Tue Jan 10 21:28:10 2012
+++ packages/jquery/jquery.spec	Thu Feb  9 15:21:51 2012
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 # TODO
-# - drop the addon plugins, say in 1.7?
+# - drop the addon plugins, say in 1.8?
 
 # jquery plugin version
 %define		field_ver	0.9.2
@@ -16,6 +16,8 @@
 # Source0-md5:	9118381924c51c89d9414a311ec9c97f
 Source10:	http://code.jquery.com/%{name}-%{version}.js
 # Source10-md5:	c677462551f4cc0f2af192497b50f3f5
+Source11:	apache.conf
+Source12:	lighttpd.conf
 Source1:	http://plugins.jquery.com/files/%{name}.field.%{field_ver}.zip
 # Source1-md5:	1bd5d766f79034904a07ddbbab5cb27a
 Source3:	http://marcgrabanski.com/code/ui-datepicker/core/core.ui.datepicker.zip
@@ -59,29 +61,9 @@
 
 %prep
 %setup -qcT -a1 -a3
-cp -a %{SOURCE4} .
+cp -p %{SOURCE4} .
 %patch0 -p1
 
-# apache1/apache2 conf
-cat > apache.conf <<'EOF'
-Alias /js/jquery %{_appdir}
-# legacy
-Alias /jquery %{_appdir}
-<Directory %{_appdir}>
-	Allow from all
-	Options +FollowSymLinks
-</Directory>
-EOF
-
-# lighttpd conf
-cat > lighttpd.conf <<'EOF'
-alias.url += (
-    "/js/jquery" => "%{_appdir}",
-	# legacy
-    "/jquery" => "%{_appdir}",
-)
-EOF
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_appdir}/plugins
@@ -104,9 +86,9 @@
 cp -p ui.datepicker.{js,css} $RPM_BUILD_ROOT%{_appdir}/plugins
 
 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 lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -148,6 +130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2012/02/09 14:21:51  glen
+- move webserver config to separate files
+
 Revision 1.29  2012/01/10 20:28:10  glen
 - cleanup descs as well
 

================================================================
Index: packages/jquery/apache.conf
diff -u /dev/null packages/jquery/apache.conf:1.1
--- /dev/null	Thu Feb  9 15:21:57 2012
+++ packages/jquery/apache.conf	Thu Feb  9 15:21:51 2012
@@ -0,0 +1,7 @@
+Alias /js/jquery /usr/share/jquery
+# legacy
+Alias /jquery /usr/share/jquery
+<Directory /usr/share/jquery>
+	Allow from all
+	Options +FollowSymLinks
+</Directory>

================================================================
Index: packages/jquery/lighttpd.conf
diff -u /dev/null packages/jquery/lighttpd.conf:1.1
--- /dev/null	Thu Feb  9 15:21:57 2012
+++ packages/jquery/lighttpd.conf	Thu Feb  9 15:21:51 2012
@@ -0,0 +1,5 @@
+alias.url += (
+    "/js/jquery" => "/usr/share/jquery",
+	# legacy
+    "/jquery" => "/usr/share/jquery",
+)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jquery/jquery.spec?r1=1.29&r2=1.30&f=u