packages: trac/trac-apache.conf, trac/trac-lighttpd.conf, trac/trac.spec - ...

[glen]

Author: glen                         Date: Tue Apr  6 15:41:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system jquery; rel 2

---- Files affected:
packages/trac:
   trac-apache.conf (1.9 -> 1.10) , trac-lighttpd.conf (1.9 -> 1.10) , trac.spec (1.71 -> 1.72) 

---- Diffs:

================================================================
Index: packages/trac/trac-apache.conf
diff -u packages/trac/trac-apache.conf:1.9 packages/trac/trac-apache.conf:1.10
--- packages/trac/trac-apache.conf:1.9	Wed Nov  5 20:10:57 2008
+++ packages/trac/trac-apache.conf	Tue Apr  6 17:41:41 2010
@@ -1,5 +1,6 @@
 # $Id$
 Alias /trac/chrome/common /usr/share/trac/htdocs
+AliasMatch ^/trac/([^/]+)/chrome/common/js/jquery.js /usr/share/jquery/jquery.js
 AliasMatch ^/trac/([^/]+)/chrome/common/(.*) /usr/share/trac/htdocs/$2
 <Directory "/usr/share/trac/htdocs">
 	Order allow,deny

================================================================
Index: packages/trac/trac-lighttpd.conf
diff -u packages/trac/trac-lighttpd.conf:1.9 packages/trac/trac-lighttpd.conf:1.10
--- packages/trac/trac-lighttpd.conf:1.9	Thu Dec  4 12:55:33 2008
+++ packages/trac/trac-lighttpd.conf	Tue Apr  6 17:41:41 2010
@@ -6,6 +6,7 @@
 
 # rewrite for multiple svn project
 url.rewrite-final += (
+	"^/trac/[^/]+/chrome/common/js/jquery.js" => "/usr/share/jquery/jquery.js",
 	"^/trac/[^/]+/chrome/common/(.*)" => "/trac/chrome/common/$1",
 )
 

================================================================
Index: packages/trac/trac.spec
diff -u packages/trac/trac.spec:1.71 packages/trac/trac.spec:1.72
--- packages/trac/trac.spec:1.71	Sun Mar 21 19:48:04 2010
+++ packages/trac/trac.spec	Tue Apr  6 17:41:41 2010
@@ -16,7 +16,7 @@
 Summary(pl.UTF-8):	Zintegrowane scm, wiki, system śledzenia problemów i środowisko projektowe
 Name:		trac
 Version:	0.11.7
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		Applications/WWW
 Source0:	http://ftp.edgewall.com/pub/trac/Trac-%{version}.tar.gz
@@ -35,6 +35,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires:	group(http)
+Requires:	jquery
 Requires:	python-clearsilver >= 0.9.3
 Requires:	python-trac = %{version}-%{release}
 Requires:	webapps
@@ -90,6 +91,9 @@
 %patch0 -p1
 %patch1 -p1
 
+# using system jquery package
+rm trac/htdocs/js/jquery.js
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/var/lib/%{name}}
@@ -198,6 +202,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2010/04/06 15:41:41  glen
+- use system jquery; rel 2
+
 Revision 1.71  2010/03/21 18:48:04  zawadaa
 - up to 0.11.7
 - STBR
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/trac/trac-apache.conf?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/trac/trac-lighttpd.conf?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/trac/trac.spec?r1=1.71&r2=1.72&f=u