- version 2.0.13

- cvs patch removed
- added BuildConflicts e2fsprogs-devel (et_compile from e2fsprogs-devel
  are broken)
- ready for building

Changed files:
    cyrus-imapd.spec -> 1.26

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index b1d82d3ed5cd84cfb641bcb3e011b3fdb5e9e2df..971de468a73b96d019bce38c0c07fe1912798b6a 100644 (file)
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,8 +1,8 @@
 %include       /usr/lib/rpm/macros.perl
 Summary:       high-performance mail store with imap and pop3
 Name:          cyrus-imapd
-Version:       2.0.12
-Release:       0.1
+Version:       2.0.13
+Release:       1
 License:       academic/research
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
@@ -23,14 +23,15 @@ Patch0:             %{name}-snmp.patch
 Patch1:                %{name}-mandir.patch
 Patch2:                %{name}-paths.patch
 Patch3:                %{name}-overquota.patch
-Patch4:                %{name}-cvs20010425.patch
-#Patch5:               http://www.imasy.or.jp/~ume/ipv6/cyrus-imapd-2.0.12-ipv6-20010321.diff.gz
-Patch5:                %{name}-ipv6.patch
+#              http://www.imasy.or.jp/~ume/ipv6/cyrus-imapd-2.0.12-ipv6-20010321.diff.gz
+Patch4:                %{name}-ipv6.patch
 URL:           http://andrew2.andrew.cmu.edu/cyrus/imapd/
 #Icon:         cyrus.gif
-BuildRequires: cyrus-sasl-devel
-#BuildRequires:        tcl-devel >= 8.0
-BuildRequires: openssl-devel
+# make et_compile from e2progs-devel work and change this buildconflicts 
+# to buildrequires
+BuildConflicts:        e2fsprogs-devel 
+BuildRequires: cyrus-sasl-devel >= 1.5.27
+BuildRequires: openssl-devel >= 0.9.6
 BuildRequires: perl >= 5.6.1
 BuildRequires: db3-devel >= 3.1.17
 Obsoletes:     imapd
@@ -88,7 +89,6 @@ komercyjnego produktu.
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 cd makedepend