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

[Michal Hlavinka]

commit 505f6ac5222baf7dc0ef0ea4e6632eabc66d7448
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Fri Sep 16 14:22:44 2011 +0200

    do not conflict with db4-utils

 .gitignore                  |    2 ++
 cyrus-imapd.cvt_cyrusdb_all |    3 +++
 cyrus-imapd.spec            |   26 ++++++++++++++++++++++++--
 sources                     |    2 ++
 4 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e9b779f..8296fcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ cyrus_sharedbackup-0.1.tar.gz
 /cyrus-imapd-2.4.8.tar.gz
 /cyrus-imapd-2.4.10.tar.gz
 /cyrus-imapd-2.4.11.tar.gz
+/libdb-utils.x86_64.cpio
+/libdb-utils.i386.cpio
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 172702a..d64a327 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.4.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
 
@@ -32,6 +32,15 @@ Source11: README.rpm
 Source12: cyrus-imapd.service
 Source13: cyr_systemd_helper
 
+
+#temporary(Fedora 15 and 16), to workaround broken update of db4->libdb in sendmail->cyrus-sasl->%{name}
+#ok, we need libdb-utils, but it can't be installed, because it conflicts with db4-utils (rpm pulls it in)
+#so we keep libdb-utils content in /usr/lib/cyrus-imapd/libdb-utils/ but we have to get it somehow during build process
+#unfortunatelly using buildrequires does not work, because of rpm->db4-utils 
+#and yumdownloader,koji download,lftp,wget... nothing works in mock build
+Source101: libdb-utils.i386.cpio
+Source102: libdb-utils.x86_64.cpio
+
 # inclusion requested:
 # http://bugzilla.cyrusimap.org/bugzilla3/show_bug.cgi?id=3182
 # http://bugzilla.cyrusimap.org/bugzilla3/show_bug.cgi?id=3212
@@ -67,7 +76,7 @@ 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
@@ -187,6 +196,15 @@ make -C notifyd notifytest
 %install
 rm -rf %{buildroot}
 
+#temporary, install our own copy of libdb-utils
+mkdir -p %{buildroot}/%{_cyrexecdir}/libdb-utils/
+cp %{_sourcedir}/libdb-utils.%{_arch}.cpio %{buildroot}/%{_cyrexecdir}/libdb-utils/
+pushd %{buildroot}/%{_cyrexecdir}/libdb-utils/
+cpio -idv '*/usr/bin/*' <libdb-utils.%{_arch}.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 +385,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 +505,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 16 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.4.11-2
+- do not conflict with db4-utils
+
 * Fri Sep  9 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 2.4.11-1
 - update to 2.4.11
 - Fix CVE-2011-3208 (#734926, #736838)
diff --git a/sources b/sources
index df2ffa8..6761115 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 d4a066e979adbe85679a6e239d64ee74  cyrus-imapd-2.4.11.tar.gz
+f3c2c8472eb2a53875e803ba04239917  libdb-utils.x86_64.cpio
+188ade4f635526fa2cee91491194c417  libdb-utils.i386.cpio