[cyrus-imapd/f15] do not conflict with db4-utils

[Michal Hlavinka]

commit 30692b7efc06c49069bdc7d9ba9ce8305ff6b7cb
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Aug 25 16:32:18 2011 +0200

    do not conflict with db4-utils

 cyrus-imapd.cvt_cyrusdb_all |    3 +++
 cyrus-imapd.spec            |   24 ++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/cyrus-imapd.cvt_cyrusdb_all b/cyrus-imapd.cvt_cyrusdb_all
index 5a5227d..a62a069 100644
--- a/cyrus-imapd.cvt_cyrusdb_all
+++ b/cyrus-imapd.cvt_cyrusdb_all
@@ -133,6 +133,9 @@ PIDFILE=/var/run/cyrus-master${INSTANCE}.pid
 CYRUSCONF=/etc/cyrus${INSTANCE}.conf
 IMAPDCONF=/etc/imapd${INSTANCE}.conf
 
+#only for Fedora 15:
+export PATH="/usr/lib/cyrus-imapd/libdb-utils/:$PATH"
+
 # make sure what we have is a valid instance
 # and that config files are present
 if [ -n "$INSTANCE" ]; then
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 1c032c3..2035d04 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.4.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
 
@@ -61,13 +61,16 @@ BuildRequires: openldap-devel
 BuildRequires: krb5-devel
 BuildRequires: net-snmp-devel
 BuildRequires: transfig
+#temporary:
+BuildRequires: yum-utils
+#Buildrequires: libdb-utils
 
 Requires(post):   e2fsprogs, perl, grep, coreutils, findutils, systemd-units
 Requires(preun):  systemd-units, coreutils
 Requires(postun): systemd-units
 
 Requires: %{name}-utils = %{version}-%{release}
-Requires: file, libdb-utils
+Requires: file
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -128,6 +131,10 @@ one running the server.
 %patch4 -p1 -b .authid_normalize
 %patch6 -p1 -b .libdb
 
+#temporary, to workaround broken update of db4->libdb in sendmail->cyrus-sasl->%{name}
+yumdownloader libdb-utils
+rpm2cpio libdb-utils*rpm >libdb-utils.cpio
+
 install -m 644 %{SOURCE4} %{SOURCE5} %{SOURCE11} doc/
 
 # only to update config.* files
@@ -187,6 +194,15 @@ make -C notifyd notifytest
 %install
 rm -rf %{buildroot}
 
+#temporary, install our own copy of libdb-utils
+mkdir -p %{buildroot}/%{_cyrexecdir}/libdb-utils/
+mv libdb-utils.cpio %{buildroot}/%{_cyrexecdir}/libdb-utils/
+pushd %{buildroot}/%{_cyrexecdir}/libdb-utils/
+cpio -idv '*/usr/bin/*' <libdb-utils.cpio
+mv usr/bin/* .
+rm -rf usr
+popd
+
 # This is needed to install the perl files correctly
 pushd perl/imap
   %{__perl} Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
@@ -367,6 +383,7 @@ fi
 %{_sysconfdir}/cron.daily/%{name}
 /lib/systemd/system/cyrus-imapd.service
 %dir %{_cyrexecdir}
+%{_cyrexecdir}/libdb-utils
 %{_cyrexecdir}/cyr_systemd_helper
 %{_cyrexecdir}/arbitron
 %{_cyrexecdir}/arbitronsort.pl
@@ -486,6 +503,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu Aug 25 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.4.10-3
+- do not conflict with db4-utils
+
 * Mon Aug 15 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.4.10-2
 - rebuild with db5