summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-06-24 18:57:20 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-06-24 18:57:20 (GMT)
commitb07d922197421a2524151fc99c7bedebf8a400df (patch)
tree9eaa4ccbde4608d3fab1df1fc4501ee2659bd886
parent16773e22cb39e27064517fdafadc041552386f8d (diff)
downloadserver-b07d922197421a2524151fc99c7bedebf8a400df.tar.gz
kolab/issue3966 (All day event with not booked not correctly processed)
-rw-r--r--php-kolab/Kolab_Filter/ChangeLog9
-rw-r--r--php-kolab/Kolab_Filter/Kolab_Filter.spec4
-rw-r--r--php-kolab/Kolab_Filter/Makefile2
-rw-r--r--php-kolab/Kolab_Filter/issue3966.patch13
-rw-r--r--release-notes.txt8
5 files changed, 32 insertions, 4 deletions
diff --git a/php-kolab/Kolab_Filter/ChangeLog b/php-kolab/Kolab_Filter/ChangeLog
index 6a90c0f..fa939c8 100644
--- a/php-kolab/Kolab_Filter/ChangeLog
+++ b/php-kolab/Kolab_Filter/ChangeLog
@@ -1,9 +1,16 @@
+2010-06-24 Gunnar Wrobel <p@rdus.de>
+
+ * issue3966.patch, Kolab_Filter.spec:
+
+ kolab/issue3966 (All day event with "not booked" not correctly
+ processed)
+
2009-11-25 Sascha Wilde <wilde@intevation.de>
* Kolab_Filter.spec: kolab/issue973 (Rewritten from shown
inconveniently in kontact)
-2009-11-24 root <Gunnar Wrobel <wrobel@pardus.de>>
+2009-11-24 Gunnar Wrobel <p@rdus.de>
* Kolab_Filter.spec: kolab/issue3594 (Mail containing NUL byte not
delivered, Kolab Filter does not report lmtp error)
diff --git a/php-kolab/Kolab_Filter/Kolab_Filter.spec b/php-kolab/Kolab_Filter/Kolab_Filter.spec
index 65ed083..9a1a222 100644
--- a/php-kolab/Kolab_Filter/Kolab_Filter.spec
+++ b/php-kolab/Kolab_Filter/Kolab_Filter.spec
@@ -1,7 +1,7 @@
# Variables
%define V_package Kolab_Filter
%define V_version 0.1.4
-%define V_release 20091203
+%define V_release 20100624
# Package Information
Name: %{V_package}
@@ -35,6 +35,7 @@ Patch12: issue3464.patch
Patch13: issue3594.patch
Patch14: issue973.patch
Patch15: issue3965.patch
+Patch16: issue3966.patch
# Build Info
Prefix: %{l_prefix}
@@ -85,6 +86,7 @@ resource management as well as some Kolab server sender policies.
%patch -p1 -P 13
%patch -p1 -P 14
%patch -p1 -P 15
+ %patch -p1 -P 16
cp %{S:1} .
%build
diff --git a/php-kolab/Kolab_Filter/Makefile b/php-kolab/Kolab_Filter/Makefile
index 443f99f..5243d6b 100644
--- a/php-kolab/Kolab_Filter/Makefile
+++ b/php-kolab/Kolab_Filter/Makefile
@@ -6,7 +6,7 @@ RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\
SOURCE_URL=http://pear.horde.org/get
SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3594.patch issue3610.patch issue3768.patch issue3868.patch issue3965.patch issue973.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3594.patch issue3610.patch issue3768.patch issue3868.patch issue3965.patch issue3966.patch issue973.patch dovecotlda-quoting.patch package.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
diff --git a/php-kolab/Kolab_Filter/issue3966.patch b/php-kolab/Kolab_Filter/issue3966.patch
new file mode 100644
index 0000000..1cccfe6
--- /dev/null
+++ b/php-kolab/Kolab_Filter/issue3966.patch
@@ -0,0 +1,13 @@
+diff -u -B -r1.15.2.3 -r1.15.2.4
+--- a/lib/Horde/Kolab/Resource.php 5 Mar 2009 10:08:53 -0000 1.15.2.3
++++ b/lib/Horde/Kolab/Resource.php 6 Mar 2009 08:43:12 -0000 1.15.2.4
+@@ -249,9 +249,6 @@
+ }
+ $object['start-date'] = $this->convert2epoch($itip->getAttributeDefault('DTSTART', ''));
+ $object['end-date'] = $this->convert2epoch($dtend);
+- if ($itip->getAttributeDefault('TRANSP', 'OPAQUE') == 'TRANSPARENT') {
+- $object['show-time-as'] = $itip->getAttributeDefault('DTEND', '');
+- }
+
+ $attendees = $itip->getAttribute('ATTENDEE');
+ if (!is_a( $attendees, 'PEAR_Error')) {
diff --git a/release-notes.txt b/release-notes.txt
index ae85158..b81164e 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -70,6 +70,11 @@ Changes between 2.2.3 and 2.2.4:
kolab/issue2244 (SpamAssassin uses DNS blacklists)
kolab/issue4176 (Adding RSS feed to Horde breaks portal screen)
+ - Kolab_Filter-0.1.4-20100624
+
+ kolab/issue3966 (All day event with "not booked" not correctly
+ processed)
+
- Kolab_Format-1.0.0-20090623
Fixed invalid package dependency on the Kolab package.
@@ -77,7 +82,8 @@ Changes between 2.2.3 and 2.2.4:
- Kolab_FreeBusy-0.1.2-20100624
kolab/issue4395 (freebusy list contains time of an event, which is
- from a now *not* shared, before shared calendar folder)
+ from a now *not* shared, before shared calendar
+ folder)
- kolab-webadmin-2.2.4-20100624