Update Cassandane checkout; drop merged patch.

This commit is contained in:
Jason Tibbitts 2018-06-01 17:34:47 -05:00
parent 3fca7a6b6f
commit 40d958330c

View File

@ -2,7 +2,7 @@
# Cassandane commit hash. Cassandane doesn't have releases often, but it
# receives constant development. This was fetched on 20180518.
%global cocas 8776dd697fa78af69876a127f2d6a9ee12c13a2f
%global cocas c8040fd9e3a3c9ec96a7b58ff8a0601756108d46
# Cassandane run by default. '--without cassandane' disables.
%bcond_without cassandane
@ -76,8 +76,6 @@ Source91: patch-cassandane-no-syslog
# Upstream ticket https://github.com/cyrusimap/cyrus-imapd/issues/1995
Source92: patch-cassandane-fix-annotator
Source93: https://patch-diff.githubusercontent.com/raw/cyrusimap/cassandane/pull/57.patch
BuildRequires: autoconf automake bison flex gcc gcc-c++ git groff libtool
BuildRequires: pkgconfig systemd transfig
@ -210,7 +208,6 @@ tar xf %SOURCE81
patch -p1 < %SOURCE91
patch -p1 < %SOURCE92
patch -p1 < %SOURCE93
cp %SOURCE82 cassandane.ini
# RF rpm-buildroot-usage