From bed4b9beec53786d7fdf8182f483c0766b4031bd Mon Sep 17 00:00:00 2001
From: Tomas Janousek <tjanouse@fedoraproject.org>
Date: Wed, 24 Jan 2007 09:50:32 +0000
Subject: [PATCH] - fixed Makefile typo (caused multiarch conflict)

---
 cyrus-imapd-2.3.7-makeinstallfix.patch | 11 +++++++++++
 cyrus-imapd.spec                       |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 cyrus-imapd-2.3.7-makeinstallfix.patch

diff --git a/cyrus-imapd-2.3.7-makeinstallfix.patch b/cyrus-imapd-2.3.7-makeinstallfix.patch
new file mode 100644
index 0000000..df984d1
--- /dev/null
+++ b/cyrus-imapd-2.3.7-makeinstallfix.patch
@@ -0,0 +1,11 @@
+--- cyrus-imapd-2.3.7/lib/Makefile.in.makeinstallfix	2006-03-17 18:29:40.000000000 +0100
++++ cyrus-imapd-2.3.7/lib/Makefile.in	2007-01-10 21:03:48.000000000 +0100
+@@ -99,7 +99,7 @@
+ 
+ LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
+ 	$(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h \
+-	$(srcdir)/strhash.o $(srcdir)/libconfig.h $(srcdir)/assert.h \
++	$(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \
+ 	imapopts.h
+ LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
+ 	xstrlcat.o xstrlcpy.o assert.o @IPV6_OBJS@
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index e0cd4d6..945a8ab 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -147,6 +147,7 @@ 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
 # 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
@@ -262,6 +263,7 @@ one running the server.
 %patch14 -p1 -b .authid_normalize
 %patch15 -p1 -b .make_md5_defaults
 %patch16 -p1 -b .db4.5
+%patch17 -p1 -b .makeinstallfix
 # fixed upstream
 #%patch100 -p1 -b .make_md5
 # fixed upstream
@@ -808,6 +810,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 24 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.7-7
+- fixed Makefile typo (caused multiarch conflict)
+
 * Mon Jan 08 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.7-6
 - #218046: applied patches to compile with db4-4.5