From bcddfe4efae8a443312da51b0c7e32ad0bd6703f Mon Sep 17 00:00:00 2001 From: Jean Raby Date: Thu, 21 Jun 2012 13:54:23 +0000 Subject: [PATCH 1/2] The new tests case was for #1839, not #1837 Monotone-Parent: 21464a96c4abb93d2143e8f30b059d2f01bab016 Monotone-Revision: ba98ce90f9ee5f3b4c038bc459d8d48d74cfad72 Monotone-Author: jraby@inverse.ca Monotone-Date: 2012-06-21T13:54:23 --- Tests/Integration/test-caldav-scheduling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Integration/test-caldav-scheduling.py b/Tests/Integration/test-caldav-scheduling.py index c9756460c..466b0b062 100755 --- a/Tests/Integration/test-caldav-scheduling.py +++ b/Tests/Integration/test-caldav-scheduling.py @@ -638,7 +638,7 @@ class CalDAVSchedulingTest(unittest.TestCase): self.assertEqual(org_ev_exception.attendee.partstat_param, "DECLINED"); def testOrganizerIsAttendee(self): - """ iCal organizer is attendee - bug #1837 """ + """ iCal organizer is attendee - bug #1839 """ # This tries to have the same behavior as iCal # 1. create an event, add an attendee and add the organizer as an attendee From 58d115817b7b000551b97f52ff0766ea0106888d Mon Sep 17 00:00:00 2001 From: Jean Raby Date: Thu, 21 Jun 2012 14:25:57 +0000 Subject: [PATCH 2/2] Remove rpm dependency on memcached as the caching daemon can run elsewhere Monotone-Parent: ba98ce90f9ee5f3b4c038bc459d8d48d74cfad72 Monotone-Revision: e699f14b51f9de020728f6ca36fdcc283587d057 Monotone-Author: jraby@inverse.ca Monotone-Date: 2012-06-21T14:25:57 --- sogo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sogo.spec b/sogo.spec index bab4cf4ea..5332b88e0 100644 --- a/sogo.spec +++ b/sogo.spec @@ -15,7 +15,7 @@ Group: Productivity/Groupware Source: SOGo-%{sogo_version}.tar.gz Prefix: /usr AutoReqProv: off -Requires: gnustep-base >= 1.23, sope%{sope_major_version}%{sope_minor_version}-core, httpd, sope%{sope_major_version}%{sope_minor_version}-core, sope%{sope_major_version}%{sope_minor_version}-appserver, sope%{sope_major_version}%{sope_minor_version}-ldap, sope%{sope_major_version}%{sope_minor_version}-cards >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-gdl1-contentstore >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-sbjson, memcached, libmemcached +Requires: gnustep-base >= 1.23, sope%{sope_major_version}%{sope_minor_version}-core, httpd, sope%{sope_major_version}%{sope_minor_version}-core, sope%{sope_major_version}%{sope_minor_version}-appserver, sope%{sope_major_version}%{sope_minor_version}-ldap, sope%{sope_major_version}%{sope_minor_version}-cards >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-gdl1-contentstore >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-sbjson, libmemcached BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRequires: gcc-objc gnustep-base gnustep-make sope%{sope_major_version}%{sope_minor_version}-appserver-devel sope%{sope_major_version}%{sope_minor_version}-core-devel sope%{sope_major_version}%{sope_minor_version}-ldap-devel sope%{sope_major_version}%{sope_minor_version}-mime-devel sope%{sope_major_version}%{sope_minor_version}-xml-devel sope%{sope_major_version}%{sope_minor_version}-gdl1-devel sope%{sope_major_version}%{sope_minor_version}-sbjson-devel libmemcached-devel %{?oc_build_depends}