gunnar: server/horde/horde-kronolith HK-JS-Fix_library_import.patch, NONE, 1.1 horde-kronolith-kolab.spec, 1.18, 1.19

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


Author: gunnar

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

Modified Files:
	horde-kronolith-kolab.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: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- horde-kronolith-kolab.spec	29 Nov 2007 08:25:52 -0000	1.18
+++ horde-kronolith-kolab.spec	29 Nov 2007 09:55:38 -0000	1.19
@@ -26,6 +26,9 @@
 Source1:        horde-kronolith-kolab-conf.template
 Source2:        conf.php
 
+# List of Patches
+Patch0:         HK-JS-Fix_library_import.patch
+
 # Build Info
 Prefix:		%{l_prefix}
 BuildRoot:	%{l_buildroot}
@@ -54,6 +57,7 @@
 	%setup -c -q -n %{V_horde_name}-h3-%{V_uver}
 
 	cd %{V_horde_name}-h3-%{V_uver}
+	%patch -p2 -P 0
 	cd ..
 
 %build





More information about the commits mailing list