diff --git a/libetpan-multiarch.patch b/libetpan-multiarch.patch new file mode 100644 index 0000000..68f65bd --- /dev/null +++ b/libetpan-multiarch.patch @@ -0,0 +1,12 @@ +--- libetpan-config.in.orig 2008-01-05 01:06:58.000000000 +0100 ++++ libetpan-config.in 2008-01-05 01:07:34.000000000 +0100 +@@ -47,8 +47,7 @@ + echo $includedir + ;; + --libs) +- libdir=-L@libdir@ +- echo $libdir -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@ ++ echo -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@ + ;; + *) + echo "${usage}" 1>&2 diff --git a/libetpan.spec b/libetpan.spec index d7ef056..87f4ffc 100644 --- a/libetpan.spec +++ b/libetpan.spec @@ -1,12 +1,13 @@ Name: libetpan Version: 0.52 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries License: BSD URL: http://www.etpan.org/ Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz +Patch0: libetpan-multiarch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel @@ -32,10 +33,11 @@ with %{name}. %prep %setup -q +%patch0 %build %configure --disable-static --with-gnutls=no -make # %{?_smp_mflags} not parallel clean +make %{?_smp_mflags} %install @@ -45,6 +47,8 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.11.0.0 +touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/libetpan-config + %clean rm -rf $RPM_BUILD_ROOT @@ -64,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Sat Jan 05 2008 Andreas Bierfert +- 0.52-4 +- fix #342021 multiarch + * Thu Dec 06 2007 Andreas Bierfert - 0.52-3 - bump