gunnar: server/horde/fbview-kronolith HK-JS-Fix_library_import.patch, NONE, 1.1 fbview-kronolith.spec, 1.15, 1.16

cvs at kolab.org cvs at kolab.org
Thu Nov 29 10:55:40 CET 2007


Author: gunnar

Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv11022/horde/fbview-kronolith

Modified Files:
	fbview-kronolith.spec 
Added Files:
	HK-JS-Fix_library_import.patch 
Log Message:
Import a past-RC1 patch from upstream. Otherwise we can't edit our calendars and tasklists.

--- NEW FILE: HK-JS-Fix_library_import.patch ---
Fixes a problem with importing the WebDAV library.

diff -r 56b552eb6b01 kronolith/calendars.php
--- a/kronolith/calendars.php	Wed Nov 28 17:00:34 2007 +0100
+++ b/kronolith/calendars.php	Thu Nov 29 09:54:49 2007 +0100
@@ -13,7 +13,9 @@
 @define('KRONOLITH_BASE', dirname(__FILE__));
 require_once KRONOLITH_BASE . '/lib/base.php';
 require_once 'Horde/RPC.php';
-require_once 'Horde/RPC/webdav.php';
+if (@include_once 'HTTP/WebDAV/Server.php') {
+    require_once 'Horde/RPC/webdav.php';
+}
 
 // Exit if this isn't an authenticated user.
 if (!Auth::getAuth()) {

Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- fbview-kronolith.spec	29 Nov 2007 08:25:51 -0000	1.15
+++ fbview-kronolith.spec	29 Nov 2007 09:55:38 -0000	1.16
@@ -37,7 +37,9 @@
 Source5:        savedattlist.inc
 Source6:        open_savedattlist_win.js
 
+# List of Patches
 Patch0:         fbview.patch
+Patch1:         HK-JS-Fix_library_import.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -68,6 +70,7 @@
 
 	cd %{V_horde_name}-h3-%{V_uver}
 	%patch -p0 -P 0
+	%patch -p2 -P 1
 	cd ..
 
 %build





More information about the commits mailing list