- added link patch (fixes curl and expat detection with as-needed enforced)

- BR: liblockfile-devel
- release 2

diff --git a/libetpan-link.patch b/libetpan-link.patch
new file mode 100644 (file)
index 0000000..b13b0f9
--- /dev/null
+++ b/libetpan-link.patch
@@ -0,0 +1,34 @@
+--- libetpan-1.1/configure.ac.orig     2012-09-22 10:40:15.782709486 +0200
++++ libetpan-1.1/configure.ac  2012-09-22 17:24:21.455537464 +0200
+@@ -577,12 +577,12 @@
+   AC_CHECK_HEADER(curl/curl.h, [libcurl=yes])
+   if test "x$libcurl" = "xyes"; then
+     AC_MSG_CHECKING([whether curl-config hints compiles and links fine])
+-    OLDFLAGS="$LDFLAGS"
+-    LDFLAGS="$LDFLAGS `$libcurlconfig --libs 2>/dev/null`"
++    OLDLIBS="$LIBS"
++    LIBS="$LIBS `$libcurlconfig --libs 2>/dev/null`"
+     AC_TRY_LINK([], [curl_easy_init();], [libcurl=yes], [libcurl=no])
+     AC_MSG_RESULT([$libcurl])
+     if test "x$libcurl" = "xno"; then
+-      LDFLAGS="$OLDFLAGS"
++      LIBS="$OLDLIBS"
+     fi
+   fi
+ 
+@@ -609,12 +609,12 @@
+ AC_CHECK_HEADER(expat.h, [libexpat=yes])
+ if test "x$libexpat" = "xyes"; then
+   AC_MSG_CHECKING([whether libexpat compiles and links fine])
+-  OLDFLAGS="$LDFLAGS"
+-  LDFLAGS="$LDFLAGS -lexpat"
++  OLDLIBS="$LIBS"
++  LIBS="$LIBS -lexpat"
+   AC_TRY_LINK([], [XML_SetElementHandler();], [libexpat=yes], [libexpat=no])
+   AC_MSG_RESULT([$libexpat])
+   if test "x$libexpat" = "xno"; then
+-    LDFLAGS="$OLDFLAGS"
++    LIBS="$OLDLIBS"
+   fi
+ fi
+ 

diff --git a/libetpan.spec b/libetpan.spec
index 89a2abf60379c7ad98ab4beb1140228f69b4228b..a92cc1d86ee6b6ad232d791eb857371c2e6f9e04 100644 (file)
--- a/libetpan.spec
+++ b/libetpan.spec
@@ -2,16 +2,21 @@ Summary:      Portable mail access library
 Summary(pl.UTF-8):     Przenośna biblioteka dostępu do poczty
 Name:          libetpan
 Version:       1.1
-Release:       1
+Release:       2
 License:       BSD
 Group:         Libraries
 Source0:       http://download.sourceforge.net/libetpan/%{name}-%{version}.tar.gz
 # Source0-md5: 6fee60d08506e941642b8fa087e60b07
 Patch0:                %{name}-db.patch
+Patch1:                %{name}-link.patch
 URL:           http://sourceforge.net/projects/libetpan/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.61
 BuildRequires: automake
+BuildRequires: curl-devel
+BuildRequires: cyrus-sasl-devel >= 2
 BuildRequires: db-devel >= 4
+BuildRequires: expat-devel
+BuildRequires: liblockfile-devel
 BuildRequires: libtool
 BuildRequires: openssl-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,15 +32,19 @@ TCP/IP and SSL/TCP/IP, already implemented), local storage
 Celem biblioteki jest udostępnienie przenośnego, efektywnego
 pośrednika dla różnych metod dostępu do poczty. Pozwala na: obsługę
 różnych protokołów sieciowych (IMAP/NNTP/POP3/SMTP przez TCP/IP oraz
-SSL/TCP/IP), obsługę lokalnych zasobów (mbox/MH/maildir) czy
-parsowanie wiadomości MIME.
+SSL/TCP/IP), obsługę lokalnych zasobów (mbox/MH/maildir), a także
+analizę wiadomości MIME.
 
 %package devel
 Summary:       Header files for libEtPan
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libEtPan
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      curl-devel
+Requires:      cyrus-sasl-devel >= 2
 Requires:      db-devel >= 4
+Requires:      expat-devel
+Requires:      liblockfile-devel
 Requires:      openssl-devel
 
 %description devel
@@ -59,11 +68,13 @@ Statyczna biblioteka libEtPan.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure
 %{__make}
@@ -82,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS
+%doc COPYRIGHT ChangeLog NEWS
 %attr(755,root,root) %{_libdir}/libetpan.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libetpan.so.16
 
@@ -93,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libetpan.so
 %{_libdir}/libetpan.la
 %{_includedir}/libetpan
-%{_includedir}/*.h
+%{_includedir}/libetpan.h
 
 %files static
 %defattr(644,root,root,755)