From 16b57fb7e8acaddb4cf2a8325eb9de066ab992ae Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Sep 08 2008 04:27:24 +0000 Subject: - version upgrade --- diff --git a/.cvsignore b/.cvsignore index 42a447b..ddfcd6d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libetpan-0.54.tar.gz +libetpan-0.56.tar.gz diff --git a/libetpan-mailimf.patch b/libetpan-mailimf.patch deleted file mode 100644 index db6bd1e..0000000 --- a/libetpan-mailimf.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- mailimf.c 2008/02/20 22:15:52 1.46 -+++ mailimf.c 2008/05/22 22:22:34 1.47 -@@ -30,7 +30,7 @@ - */ - - /* -- * $Id: libetpan-mailimf.patch,v 1.1 2008/06/17 11:51:33 awjb Exp $ -+ * $Id: libetpan-mailimf.patch,v 1.1 2008/06/17 11:51:33 awjb Exp $ - */ - - #ifdef HAVE_CONFIG_H -@@ -3023,11 +3023,14 @@ - break; - case MAILIMF_ERROR_PARSE: - r = mailimf_cfws_parse(message, length, &cur_token); -- if ((r != MAILIMF_NO_ERROR) && (r != MAILIMF_ERROR_PARSE)) -- return r; -+ if ((r != MAILIMF_NO_ERROR) && (r != MAILIMF_ERROR_PARSE)) { -+ res = r; -+ goto free_display_name; -+ } - break; - default: -- return r; -+ res = r; -+ goto free_display_name; - } - - r = mailimf_semi_colon_parse(message, length, &cur_token); -@@ -3048,7 +3051,9 @@ - return MAILIMF_NO_ERROR; - - free_mailbox_list: -- mailimf_mailbox_list_free(mailbox_list); -+ if (mailbox_list != NULL) { -+ mailimf_mailbox_list_free(mailbox_list); -+ } - free_display_name: - mailimf_display_name_free(display_name); - err: - diff --git a/libetpan.spec b/libetpan.spec index 0c5dfc0..f404599 100644 --- a/libetpan.spec +++ b/libetpan.spec @@ -1,5 +1,5 @@ Name: libetpan -Version: 0.54 +Version: 0.56 Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access @@ -8,12 +8,12 @@ License: BSD URL: http://www.etpan.org/ Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz Patch0: libetpan-multiarch.patch -Patch1: libetpan-mailimf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel BuildRequires: cyrus-sasl-devel BuildRequires: openssl-devel +BuildRequires: libtool %description The purpose of this mail library is to provide a portable, efficient middleware @@ -35,21 +35,18 @@ with %{name}. %prep %setup -q %patch0 -pushd ./src/low-level/imf/ -%patch1 -popd %build %configure --disable-static --with-gnutls=no -make %{?_smp_mflags} +make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.13.0.0 +rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.{,l}a +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.13.1.1 touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/libetpan-config @@ -73,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Mon Sep 08 2008 Andreas Bierfert +- 0.56-1 +- version upgrade + * Tue Jun 17 2008 Andreas Bierfert - 0.54-1 - version upgrade diff --git a/sources b/sources index 27288d7..1edaa7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0214de45b1b92277fbfc6c9a00af5316 libetpan-0.54.tar.gz +3f0c0ca0c45c0bd78070c066ae53d417 libetpan-0.56.tar.gz