[packages/libetpan] - up to 1.7.2

arekm arekm at pld-linux.org
Fri Aug 5 14:56:29 CEST 2016


commit 7065a2a280e23826692dc5ddff01d8a7f49edbe0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Aug 5 14:56:21 2016 +0200

    - up to 1.7.2

 libetpan-db.patch   | 11 -----------
 libetpan-link.patch | 54 ++++++++++++++++++++++++++---------------------------
 libetpan.spec       | 25 +++++++++++++++----------
 3 files changed, 42 insertions(+), 48 deletions(-)
---
diff --git a/libetpan.spec b/libetpan.spec
index b0021c9..1dbf853 100644
--- a/libetpan.spec
+++ b/libetpan.spec
@@ -1,23 +1,24 @@
 Summary:	Portable mail access library
 Summary(pl.UTF-8):	Przenośna biblioteka dostępu do poczty
 Name:		libetpan
-Version:	1.1
-Release:	7
+Version:	1.7.2
+Release:	1
 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/
+Source0:	https://github.com/dinhviethoa/libetpan/archive/%{version}.tar.gz
+# Source0-md5:	c725728ce39b511a533d629ea78c1884
+Patch0:		%{name}-link.patch
+URL:		https://github.com/dinhviethoa/libetpan
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
 BuildRequires:	curl-devel
 BuildRequires:	cyrus-sasl-devel >= 2
 BuildRequires:	db-devel >= 4
+BuildRequires:	docbook-style-dsssl
 BuildRequires:	expat-devel
 BuildRequires:	liblockfile-devel
 BuildRequires:	libtool
+BuildRequires:	openjade
 BuildRequires:	openssl-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -68,7 +69,6 @@ Statyczna biblioteka libEtPan.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -76,8 +76,13 @@ Statyczna biblioteka libEtPan.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--enable-ipv6 \
+	--with-openssl \
+	--without-gnutls
 %{__make}
+%{__make} -C doc doc \
+	DSL=%{_datadir}/sgml/docbook/dsssl-stylesheets/html/docbook.dsl
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -95,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYRIGHT ChangeLog NEWS
 %attr(755,root,root) %{_libdir}/libetpan.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libetpan.so.16
+%attr(755,root,root) %ghost %{_libdir}/libetpan.so.20
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/libetpan-db.patch b/libetpan-db.patch
deleted file mode 100644
index 7edd45f..0000000
--- a/libetpan-db.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libetpan-1.1/configure.ac~	2011-07-12 09:27:46.000000000 +0200
-+++ libetpan-1.1/configure.ac	2012-09-05 13:25:21.898524839 +0200
-@@ -385,7 +385,7 @@
-   case "$DBVERS" in
-     3)
-     AC_MSG_RESULT([version 3.x or above])
--    for lib in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
-+    for lib in db-5.3 db-5.2 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
-       if test "x$DBLINKED" = "x0"; then
- dnl        AC_CHECK_LIB($lib, db_create, [DBLIB="-l$lib"; DBLINKED=1], [])
- dnl installations of libdb4 function names are defined in db.h
diff --git a/libetpan-link.patch b/libetpan-link.patch
index b13b0f9..0a5df6f 100644
--- a/libetpan-link.patch
+++ b/libetpan-link.patch
@@ -1,34 +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])
+--- libetpan-1.7.2/configure.ac~	2016-05-26 07:27:47.000000000 +0200
++++ libetpan-1.7.2/configure.ac	2016-08-05 14:44:19.882952496 +0200
+@@ -618,12 +618,12 @@ else
+       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
+       
+@@ -673,12 +673,12 @@ else
+   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 `$libcurlconfig --libs 2>/dev/null`"
+-    LDFLAGS="$LDFLAGS -lexpat"
 +    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
++    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
- 
-@@ -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
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libetpan.git/commitdiff/7065a2a280e23826692dc5ddff01d8a7f49edbe0



More information about the pld-cvs-commit mailing list