gunnar: server/horde/horde-nag HK-JS-Fix_library_import.patch, NONE, 1.1 horde-nag-kolab.spec, 1.16, 1.17

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


Author: gunnar

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

Modified Files:
	horde-nag-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 39ccfa2e6380 nag/tasklists.php
--- a/nag/tasklists.php	Thu Nov 29 09:54:49 2007 +0100
+++ b/nag/tasklists.php	Thu Nov 29 09:56:00 2007 +0100
@@ -14,7 +14,9 @@
 @define('NAG_BASE', dirname(__FILE__));
 require_once NAG_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-nag-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/horde-nag-kolab.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- horde-nag-kolab.spec	29 Nov 2007 08:25:52 -0000	1.16
+++ horde-nag-kolab.spec	29 Nov 2007 09:55:38 -0000	1.17
@@ -25,6 +25,9 @@
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
 Source1:        conf.php
 
+# List of Patches
+Patch0:         HK-JS-Fix_library_import.patch
+
 # Build Info
 Prefix:		%{l_prefix}
 BuildRoot:	%{l_buildroot}
@@ -47,6 +50,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