gunnar: server/horde/horde-turba ChangeLog, 1.3, 1.3.2.1 horde-turba-kolab.spec, 1.4, 1.4.2.1 lib-Driver-ldap.php.patch, 1.1, 1.1.2.1 lib-base.php.patch, 1.1, NONE
cvs at kolab.org
cvs at kolab.org
Fri Jul 20 17:07:49 CEST 2007
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv17810/horde/horde-turba
Modified Files:
Tag: kolab_2_1_branch
ChangeLog horde-turba-kolab.spec lib-Driver-ldap.php.patch
Removed Files:
Tag: kolab_2_1_branch
lib-base.php.patch
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- ChangeLog 31 May 2007 14:31:10 -0000 1.3
+++ ChangeLog 20 Jul 2007 15:07:47 -0000 1.3.2.1
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel <p at rdus.de>
+
+ * horde-passwd-kolab.spec: Update to 20070719. Fixed patching.
+
2007-05-31 Gunnar Wrobel <p at rdus.de>
* horde-turba-kolab.spec: Update to 20070601
Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- horde-turba-kolab.spec 31 May 2007 14:31:10 -0000 1.4
+++ horde-turba-kolab.spec 20 Jul 2007 15:07:47 -0000 1.4.2.1
@@ -2,8 +2,8 @@
%define V_horde_name turba
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -32,7 +32,8 @@
#
# The second part of the patch allows to rename
# shares
-Patch0: lib-Turba.php.patch
+#Patch0: lib-Turba.php.patch
+# FIXME: Disabled for now.
##################################################
# PATCH COMMENT
@@ -40,22 +41,19 @@
# This is required until the Horde::Perms package
# has been rewritten so that it does not use
# the Horde::DataTree module anymore
-Patch1: config-sources.php.dist.patch
-Patch2: lib-Driver-ldap.php.patch
-
-##################################################
-# PATCH COMMENT
-#
-# This can be omitted once Turba uses the generic
-# Share driver again.
-# See http://bugs.horde.org/ticket/?id=4960
-Patch3: lib-base.php.patch
+Patch0: config-sources.php.dist.patch
+Patch1: lib-Driver-ldap.php.patch
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: apache, php, php::with_pear = yes
-PreReq: horde-kolab >= 20070131, apache, php, php::with_pear = yes
+
+#Pre requisites
+
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
@@ -81,8 +79,7 @@
cd %{V_horde_name}
%patch -p0 -P 0
%patch -p0 -P 1
- %patch -p0 -P 2
- %patch -p0 -P 3
+# %patch -p0 -P 2
cd ..
%build
Index: lib-Driver-ldap.php.patch
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/lib-Driver-ldap.php.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- lib-Driver-ldap.php.patch 25 May 2007 12:07:17 -0000 1.1
+++ lib-Driver-ldap.php.patch 20 Jul 2007 15:07:47 -0000 1.1.2.1
@@ -4,7 +4,7 @@
retrieving revision 1.87
diff -u -B -r1.87 ldap.php
--- lib/Driver/ldap.php 4 Jan 2007 05:08:59 -0000 1.87
-+++ lib/Driver/ldap.php 25 May 2007 11:02:09 -0000
++++ lib/Driver/ldap.php 18 Jun 2007 15:15:15 -0000
@@ -54,6 +54,9 @@
if (empty($params['deref'])) {
$params['deref'] = LDAP_DEREF_NEVER;
@@ -29,7 +29,7 @@
+ */
+ function hasPermission($perm)
+ {
-+ if ($this->usingShares || $this->_params['read_only'] === false) {
++ if ($this->_params['read_only'] === false) {
+ return parent::hasPermission($perm);
+ } else {
+ switch ($perm) {
--- lib-base.php.patch DELETED ---
More information about the commits
mailing list