File project.diff of Package cyrus-imapd

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package cyrus-imapd (Revision 282a6ec53350b6f0fb1f3487bc80cef0)

Currently displaying revision 282a6ec53350b6f0fb1f3487bc80cef0 , Show latest

--- cyrus-imapd.changes.orig
+++ cyrus-imapd.changes
@@ -1,4 +1,21 @@
 -------------------------------------------------------------------
+Wed Nov 25 10:18:35 UTC 2009 - rhafer@novell.com
+
+- Renumber kolab patches to start with 100
+- cyrus-imapd-kolab now conflicts with cyrus-imapd
+
+-------------------------------------------------------------------
+
+Sat Nov 21 20:46:22 CEST 2009 - rbos@opensuse.org
+
+- Added a switch to build Kolab enabled rpms, (cyrus with patches
+  needed by the groupware project Kolab) 
+- Added cyrus-imapd-2.3.14 patches for KOLAB
+- Updated patch ptclient_afskrb_return.patch to return NULL instead
+  of 0
+
+-------------------------------------------------------------------
+
 Tue Nov  3 19:09:12 UTC 2009 - coolo@novell.com
 
 - updated patches to apply with fuzz=0
--- cyrus-imapd.spec.orig
+++ cyrus-imapd.spec
@@ -18,19 +18,32 @@
 # norootforbuild
 
 
+%define prjname cyrus-imapd
+
+%define enable_kolab 0
+%if !%enable_kolab
 Name:           cyrus-imapd
+%else
+Name:           cyrus-imapd-kolab
+BuildRequires:  openldap2-devel
+%endif
+
 BuildRequires:  bison cyrus-sasl-devel db-devel drac ed flex krb5-devel openslp-devel openssl-devel opie pwdutils tcpd-devel
 Url:            http://cyrusimap.web.cmu.edu/
 License:        BSD 3-clause (or similar)
 Group:          Productivity/Networking/Email/Servers
 Requires:       perl-Cyrus-IMAP perl-Cyrus-SIEVE-managesieve
 Recommends:     perl-TermReadLine-Gnu
+%if %enable_kolab
+Conflicts:      imap courier-imap cyrus-imapd
+%else
 Conflicts:      imap courier-imap
+%endif
 AutoReqProv:    on
 Summary:        The Cyrus IMAP and POP Mail Server
 Version:        2.3.14
 Release:        8
-Source:         %{name}-%{version}.tar.bz2
+Source:         %{prjname}-%{version}.tar.bz2
 Source1:        cyrus-imapd-rc.tar.gz
 # The autocreate Patchset is maintained at:
 # http://email.uoa.gr/projects/cyrus/autocreate/
@@ -39,12 +52,26 @@ Patch2:         authid_normalize.patch
 Patch3:         auth_krb5-sentinel.patch
 Patch4:         luser_relay.patch
 Patch5:         cyrus-imapd-perl.patch
+Patch6:         ptclient_afskrb_return.patch
 Patch8:         tail-1-fix.patch
 Patch10:        cyrus-imapd-openslp.patch
 Patch12:        pie.patch
 Patch18:        cyrus-imapd-perl-path.patch
 Patch19:        sieve_action-overflow.dif
 Patch20:        sieve_relat-overflow.dif
+
+%if %enable_kolab
+# KOLAB_cyrus-imapd patches are maintained at
+# http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/imapd/patches/
+Patch100:        KOLAB_cyrus-imapd-%{version}_Cyradm_Annotations.patch
+Patch101:        KOLAB_cyrus-imapd-%{version}_Annotations2.patch
+Patch102:        KOLAB_cyrus-imapd-%{version}_Folder-names.patch
+Patch103:        KOLAB_cyrus-imapd-%{version}_Groups2.patch
+Patch104:        KOLAB_cyrus-imapd-%{version}_Logging.patch
+Patch105:        KOLAB_cyrus-imapd-%{version}_timsieved_starttls-sendcaps.patch
+Patch106:        KOLAB_cyrus-imapd-%{version}_UID.patch
+%endif
+
 PreReq:         /usr/sbin/useradd /usr/sbin/usermod %insserv_prereq %fillup_prereq /bin/sed /bin/awk /bin/grep /bin/cat /usr/bin/find /usr/bin/db_verify sh-utils fileutils cyrus-sasl netcfg /usr/bin/strings
 Recommends:     cron
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -64,7 +91,7 @@ Recommends:     perl-TermReadLine-Gnu
 AutoReqProv:    on
 Group:          Development/Libraries/Perl
 
-%package -n cyrus-imapd-devel
+%package -n %{name}-devel
 License:        BSD 3-clause (or similar)
 Summary:        Libraries and Includes for Cyrus IMAPd
 AutoReqProv:    on
@@ -100,7 +127,7 @@ Authors:
 --------
     Office of Technology Transfer Carnegie Mellon University <tech-transfer@andrew.cmu.edu>
 
-%description -n cyrus-imapd-devel
+%description -n %{name}-devel
 This package provides the libraries and include files for Cyrus IMAPd.
 
 
@@ -112,13 +139,16 @@ Authors:
 %define cyrus_uid 96
 
 %prep
-%setup -q -a 1
+%setup -q -a 1 -n %{prjname}-%{version}
 patch -s -p0 < contrib/drac_auth.patch
 %patch1 -p1
 %patch2
 %patch3 -p1
 %patch4
 %patch5
+# This patch(6) is only needed with the configure argument --with-ldap.  When
+# this argument is used, code is included which results in an rpmlint error.
+%patch6 -p2
 %patch8
 %patch10
 %patch12 -p1
@@ -126,6 +156,16 @@ patch -s -p0 < contrib/drac_auth.patch
 %patch19
 %patch20 -p1
 
+%if %enable_kolab
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%endif
+
 %build
 #%{?suse_update_config:%{suse_update_config -l -f build}}
 #rm -f sieve/sieve.c sieve/addr.c
@@ -133,6 +173,15 @@ patch -s -p0 < contrib/drac_auth.patch
 #autoreconf --force --install
 rm -fr aclocal.m4 configure config.h.in autom4te.cache
 sh SMakefile
+
+%if %enable_kolab
+  # CONFIGURE_ARGS="--with-ldap=%{_includedir}"
+  # For unknow reason the configure argument --with-ldap=%{_includedir} is not
+  # picked up by configure, use the line below as a workaround until the
+  # configure --with-ldap actually works
+  sed -i 's;$IMAP_LIBS="${LIB_SASL}$ $.*"$;\1 -lldap -llber \2;g' configure
+%endif
+
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -I/usr/include/kerberosIV -I%{_libdir}/sasl2/include"
 ./configure --prefix=/usr \
 	    --mandir=%{_mandir} \
@@ -156,7 +205,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-stric
             --with-openssl \
 	    --with-perl=/usr/bin/perl \
 	    --with-syslogfacility=DAEMON \
-	    --without-ucdsnmp 
+	    --without-ucdsnmp $CONFIGURE_ARGS
 make depend
 make
 
@@ -330,7 +379,7 @@ test -n "$IMAPUP" && {
 %doc COPYRIGHT README README.andrew doc
 %doc SuSE/README.SuSE
 
-%files -n cyrus-imapd-devel
+%files -n %{name}-devel
 %defattr(-,root,root)
 /usr/include/cyrus
 %{_libdir}/libcyrus.a

Places

File project.diff of Package cyrus-imapd (Revision 282a6ec53350b6f0fb1f3487bc80cef0)

Places