rpms/cyrus-imapd/devel cyrus-imapd-2.3.7-makeinstallfix.patch, NONE, 1.1 cyrus-imapd.spec, 1.18, 1.19

[Tomas Janousek (tjanouse)]

Author: tjanouse

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4763

Modified Files:
	cyrus-imapd.spec 
Added Files:
	cyrus-imapd-2.3.7-makeinstallfix.patch 
Log Message:
* Wed Jan 24 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-7
- fixed Makefile typo (caused multiarch conflict)


cyrus-imapd-2.3.7-makeinstallfix.patch:

--- NEW FILE cyrus-imapd-2.3.7-makeinstallfix.patch ---
--- 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@


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cyrus-imapd.spec	8 Jan 2007 12:52:34 -0000	1.18
+++ cyrus-imapd.spec	24 Jan 2007 09:50:32 -0000	1.19
@@ -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 @@
 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 @@
 %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 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 24 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-7
+- fixed Makefile typo (caused multiarch conflict)
+
 * Mon Jan 08 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-6
 - #218046: applied patches to compile with db4-4.5