[cyrus-imapd] spec cleanup for pending package review

Michal Hlavinka mhlavink at fedoraproject.org
Thu Aug 18 13:51:35 UTC 2011


commit f0183d33fa3e819ccf0beb230ba4eb0736e7c7ad
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Aug 18 15:51:13 2011 +0200

    spec cleanup for pending package review

 cyrus-imapd-2.3.16-autocreate-0.10-0.diff | 2401 -----------------------------
 cyrus-imapd-2.3.16-autosieve-0.6.0.diff   |  181 ---
 cyrus-imapd.spec                          |   13 +-
 3 files changed, 2 insertions(+), 2593 deletions(-)
---
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index b083dd1..7d486d6 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -32,15 +32,6 @@ Source11: README.rpm
 Source12: cyrus-imapd.service
 Source13: cyr_systemd_helper
 
-# inclusion requested:
-# http://bugzilla.cyrusimap.org/bugzilla3/show_bug.cgi?id=3182
-# http://bugzilla.cyrusimap.org/bugzilla3/show_bug.cgi?id=3212
-Patch1: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.16/cyrus-imapd-2.3.16-autocreate-0.10-0.diff
-
-# inclusion requested:
-# https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=3212
-Patch2: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.16/cyrus-imapd-2.3.16-autosieve-0.6.0.diff
-
 Patch3: http://www.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
 
 Patch4: cyrus-imapd-2.3.1-authid_normalize.patch
@@ -70,6 +61,8 @@ Requires: %{name}-utils = %{version}-%{release}
 Requires: file, libdb-utils
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 The %{name} package contains the core of the Cyrus IMAP server.
 It is a scaleable enterprise mail system designed for use from
@@ -122,8 +115,6 @@ one running the server.
 
 %prep
 %setup -q
-#%patch1 -p1 -b .autocreate
-#%patch2 -p1 -b .autosieve
 %patch3 -p1 -b .flock
 %patch4 -p1 -b .authid_normalize
 %patch6 -p1 -b .libdb


More information about the scm-commits mailing list