remove Kolab support

imapd/imapd.spec

@@ -45,19 +45,6 @@ Release:      20100110
 %option       with_listext       no
 %option       with_nntp          no
 %option       with_ldap          no
-%option       with_annotate      no
-%option       with_morelogging   no
-%option       with_kolab         no
-
-#   fixing implicit inter-module dependencies and correlations
-%if "%{with_kolab}" == "yes"
-%undefine     with_group_igncase
-%undefine     with_ldap
-%undefine     with_annotate
-%define       with_group_igncase yes
-%define       with_ldap          yes
-%define       with_annotate      yes
-%endif
 
 #   list of sources
 #   (ping p@rdus.de if the Kolab patches are unavailable for the latest Cyrus IMAPd version)
@@ -68,11 +55,6 @@ Source3:      imapd.conf
 Source4:      fsl.imapd
 Patch0:       imapd.patch
 Patch1:       imapd.patch.group
-Patch2:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Annotations2.patch
-Patch3:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-cyradm-2.3.11_Annotations.patch
-Patch4:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Logging.patch
-Patch5:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_UID.patch
-Patch6:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Folder-names.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -130,28 +112,11 @@ AutoReqProv:  no
         lib/auth_unix.c
 %endif
 
-    #   add optional folder annotation support
-%if "%{with_annotate}" == "yes"
-    sed <%{PATCH2} -e '5,27d' | %{l_patch} -p1
-    %patch -p1 -P 3
-%endif
-
-    #   add optional support for extended logging
-%if "%{with_morelogging}" == "yes"
-     %patch -p1 -P 4
-%endif
-
     #   add optional support for ldap
 %if "%{with_ldap}" == "yes"
     %{l_shtool} subst -e 's;\(IMAP_LIBS="${LIB_SASL}\) \(.*"\);\1 -lldap -llber \2;g' configure
 %endif
 
-    #   add optional kolab specific stuff for ldap and goodchars
-%if "%{with_kolab}" == "yes"
-     sed <%{PATCH5} -e '3,14d' | %{l_patch} -p1
-     %patch -p1 -P 6
-%endif
-
     #   add optional DRAC file support
 %if "%{with_drac}" == "yes"
     %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch