- fixed Makefile typo (caused multiarch conflict)

This commit is contained in:
Tomas Janousek 2007-01-24 09:50:32 +00:00
parent d5bbf66cbd
commit bed4b9beec
2 changed files with 17 additions and 1 deletions

View File

@ -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@

View File

@ -1,6 +1,6 @@
Name: cyrus-imapd Name: cyrus-imapd
Version: 2.3.7 Version: 2.3.7
Release: 6%{?dist} Release: 7%{?dist}
# ********************** BUILD TIME OPTIONS START ********************** # ********************** BUILD TIME OPTIONS START **********************
@ -147,6 +147,7 @@ Patch13: allow_auth_plain_proxying.patch
Patch14: cyrus-imapd-2.3.1-authid_normalize.patch Patch14: cyrus-imapd-2.3.1-authid_normalize.patch
Patch15: cyrus-imapd-2.3.1-make_md5_defaults.patch Patch15: cyrus-imapd-2.3.1-make_md5_defaults.patch
Patch16: cyrus-imapd-2.3.7-db4.5.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 # Patches >= 100 are / will be fixed in CVS
Patch100: cyrus-imapd-2.3.1-make_md5.patch Patch100: cyrus-imapd-2.3.1-make_md5.patch
Patch101: cyrus-imapd-2.3.1-backend_sigsegv.patch Patch101: cyrus-imapd-2.3.1-backend_sigsegv.patch
@ -262,6 +263,7 @@ one running the server.
%patch14 -p1 -b .authid_normalize %patch14 -p1 -b .authid_normalize
%patch15 -p1 -b .make_md5_defaults %patch15 -p1 -b .make_md5_defaults
%patch16 -p1 -b .db4.5 %patch16 -p1 -b .db4.5
%patch17 -p1 -b .makeinstallfix
# fixed upstream # fixed upstream
#%patch100 -p1 -b .make_md5 #%patch100 -p1 -b .make_md5
# fixed upstream # fixed upstream
@ -808,6 +810,9 @@ fi
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %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 * Mon Jan 08 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.7-6
- #218046: applied patches to compile with db4-4.5 - #218046: applied patches to compile with db4-4.5