rpms/cyrus-imapd/devel cyrus-imapd.spec, 1.42, 1.43 cyrus-imapd-2.2.12-dam_invalid_id-christos.patch, 1.1, NONE cyrus-imapd-2.2.12-munge8bit.patch, 1.1, NONE cyrus-imapd-2.3.1-backend_sigsegv.patch, 1.1, NONE cyrus-imapd-2.3.1-make_md5.patch, 1.1, NONE cyrus-imapd-2.3.1-replication_policycheck.patch, 1.1, NONE cyrus-imapd-2.3.7-db4.5.patch, 1.1, NONE cyrus-imapd-2.3.7-makeinstallfix.patch, 1.1, NONE

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2463

Modified Files:
	cyrus-imapd.spec 
Removed Files:
	cyrus-imapd-2.2.12-dam_invalid_id-christos.patch 
	cyrus-imapd-2.2.12-munge8bit.patch 
	cyrus-imapd-2.3.1-backend_sigsegv.patch 
	cyrus-imapd-2.3.1-make_md5.patch 
	cyrus-imapd-2.3.1-replication_policycheck.patch 
	cyrus-imapd-2.3.7-db4.5.patch 
	cyrus-imapd-2.3.7-makeinstallfix.patch 
Log Message:
* Fri Sep 14 2008 Dan Horák <dan[at]danny.cz - 2.3.12p2-2
- fix linking with db4.7 (Resolves: #461875)
- patch cleanup



Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cyrus-imapd.spec	1 Sep 2008 11:50:44 -0000	1.42
+++ cyrus-imapd.spec	12 Sep 2008 07:09:30 -0000	1.43
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.12p2
 Name: cyrus-imapd
 Version: 2.3.12p2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -134,26 +134,18 @@
 Patch2: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.12/cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff
 #Patch3: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.9/cyrus-imapd-2.3.9-rmquota+deletemailbox-0.2-1.diff
 Patch4: http://servercc.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
-Patch5: cyrus-imapd-2.2.12-munge8bit.patch
 Patch6: cyrus-imapd-2.1.16-getrlimit.patch
 Patch7: cyrus-imapd-2.3.7-nobarenewlinescheck.patch
 Patch9: cyrus-imapd-2.3.1-config_defaults.patch
 Patch10: cyrus-imapd-acceptinvalidfrom.patch
-Patch11: cyrus-imapd-2.2.12-dam_invalid_id-christos.patch
 Patch12: cyrus-imapd-2.3.7-notify_sms.patch
-Patch13: allow_auth_plain_proxying.patch
 Patch14: cyrus-imapd-2.3.1-authid_normalize.patch
 Patch15: cyrus-imapd-2.3.1-make_md5_defaults.patch
-Patch16: cyrus-imapd-2.3.7-db4.5.patch
-Patch17: cyrus-imapd-2.3.7-makeinstallfix.patch
 Patch18: cyrus-imapd-2.3.7-krb4.patch
-# Patches >= 100 are / will be fixed in CVS
-Patch100: cyrus-imapd-2.3.1-make_md5.patch
-Patch101: cyrus-imapd-2.3.1-backend_sigsegv.patch
-Patch102: cyrus-imapd-2.3.1-replication_policycheck.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch19: cyrus-imapd-2.3.12p2-db4.7.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 2.59
-BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl, perl-devel, tcp_wrappers
+BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl-devel, tcp_wrappers
 BuildRequires: %{_dbver}-devel, openssl-devel, pkgconfig
 BuildRequires: flex, bison, groff >= 1.15-8, automake
 BuildRequires: openldap-devel
@@ -239,32 +231,17 @@
 #%patch3 -p1 -b .rmquota
 %endif
 %patch4 -p1 -b .flock
-# superseded by upstream munge8bit support
-#%patch5 -p1 -b .munge8bit
 %patch6 -p1 -b .getrlimit
 %if %{NO_BARE_NL}
 %patch7 -p1 -b .nobarenewlinescheck
 %endif
 #%patch9 -p1 -b .config_defaults
 %patch10 -p1 -b .acceptinvalidfrom
-# fixed upstream already
-#%patch11 -p1 -b .dam_invalid_id
 %patch12 -p1 -b .notify_sms
-#%patch13 -p0 -b .allow_auth_plain
 %patch14 -p1 -b .authid_normalize
 %patch15 -p1 -b .make_md5_defaults
-#%patch16 -p1 -b .db4.5
-#%patch17 -p1 -b .makeinstallfix
 %patch18 -p1 -b .krb4
-# fixed upstream
-#%patch100 -p1 -b .make_md5
-# fixed upstream
-#%patch101 -p1 -b .backend_sigsegv
-# not applicable -- the policy check is not done upstream anymore at all
-# commented out with a comment: XXX is this really necessary since only sync_client talks to us?
-# probably fixes same problem as our patch, but in a different way
-# may be a risk of regressions though
-#%patch102 -p1 -b .replication_policycheck
+%patch19 -p1 -b .db4.7
 
 # only to update config.* files
 automake -a -f -c || :
@@ -807,6 +784,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 14 2008 Dan Horák <dan[at]danny.cz - 2.3.12p2-2
+- fix linking with db4.7 (Resolves: #461875)
+- patch cleanup
+
 * Mon Sep  1 2008 Dan Horák <dan[at]danny.cz - 2.3.12p2-1
 - update to new upstream version 2.3.12p2
 - update patches


--- cyrus-imapd-2.2.12-dam_invalid_id-christos.patch DELETED ---


--- cyrus-imapd-2.2.12-munge8bit.patch DELETED ---


--- cyrus-imapd-2.3.1-backend_sigsegv.patch DELETED ---


--- cyrus-imapd-2.3.1-make_md5.patch DELETED ---


--- cyrus-imapd-2.3.1-replication_policycheck.patch DELETED ---


--- cyrus-imapd-2.3.7-db4.5.patch DELETED ---


--- cyrus-imapd-2.3.7-makeinstallfix.patch DELETED ---