[cyrus-imapd/f15] try different approach

[Michal Hlavinka]

commit 5f26df9caa5404d1a31fcaba158e9badee62eb82
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Fri Aug 26 13:11:08 2011 +0200

    try different approach

 .gitignore       |    2 ++
 cyrus-imapd.spec |   20 +++++++++++---------
 sources          |    2 ++
 3 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f47daae..013eef1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ cyrus_sharedbackup-0.1.tar.gz
 /cyrus-imapd-2.4.7.tar.gz
 /cyrus-imapd-2.4.8.tar.gz
 /cyrus-imapd-2.4.10.tar.gz
+/libdb-utils.x86_64.cpio
+/libdb-utils.i386.cpio
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 2035d04..f8956cd 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -32,6 +32,15 @@ Source11: README.rpm
 Source12: cyrus-imapd.service
 Source13: cyr_systemd_helper
 
+
+#temporary, 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
@@ -61,9 +70,6 @@ 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
@@ -131,10 +137,6 @@ 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
@@ -196,9 +198,9 @@ 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/
+cp %{_sourcedir}/libdb-utils.%{_arch}.cpio %{buildroot}/%{_cyrexecdir}/libdb-utils/
 pushd %{buildroot}/%{_cyrexecdir}/libdb-utils/
-cpio -idv '*/usr/bin/*' <libdb-utils.cpio
+cpio -idv '*/usr/bin/*' <libdb-utils.%{_arch}.cpio
 mv usr/bin/* .
 rm -rf usr
 popd
diff --git a/sources b/sources
index cf7ef60..196fbc2 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 55f08eeabf2f93281e61ba27854aea67  cyrus-imapd-2.4.10.tar.gz
+b67fdc8d0a18b7f03b047a64dd53b546  libdb-utils.x86_64.cpio
+ab944a121ac8beffa1eaee5539082e02  libdb-utils.i386.cpio