[packages/serf] - updated to 1.2.1 - enable GSSAPI support by default (via heimdal) - added link patch to avoid usin

[qboosh]

commit 2a71e6bdf46f08b2132227fcab708b1e999d9787
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jun 6 15:37:14 2013 +0200

    - updated to 1.2.1
    - enable GSSAPI support by default (via heimdal)
    - added link patch to avoid using invalid -R options

 serf-link.patch | 13 +++++++++++++
 serf.spec       | 12 +++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/serf.spec b/serf.spec
index 52a25d1..d8bc92d 100644
--- a/serf.spec
+++ b/serf.spec
@@ -1,23 +1,26 @@
 #
 # Conditional build:
-%bcond_with	tests	# perform "make check" (uses localhost network, fails on apr side when IPV6 is enabled and localhost resolves only to IPV4 addresses)
+%bcond_without	kerberos5	# GSSAPI support
+%bcond_with	tests		# perform "make check" (uses localhost network, fails on apr side when IPV6 is enabled and localhost resolves only to IPV4 addresses)
 #
 Summary:	A high-performance asynchronous HTTP client library
 Summary(pl.UTF-8):	Wysokowydajna biblioteka asynchronicznego klienta HTTP
 Name:		serf
-Version:	1.2.0
+Version:	1.2.1
 Release:	1
 License:	Apache v2.0
 Group:		Libraries
 #Source0Download: http://code.google.com/p/serf/downloads/list
 Source0:	http://serf.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	e0055adfb422f30bb5daae29d15df607
+# Source0-md5:	4f8e76c9c6567aee1d66aba49f76a58b
 Patch0:		%{name}-sh.patch
+Patch1:		%{name}-link.patch
 URL:		http://code.google.com/p/serf/
 BuildRequires:	apr-devel
 BuildRequires:	apr-util-devel
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+%{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,6 +46,7 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	apr-devel
 Requires:	apr-util-devel
+%{?with_kerberos5:Requires:	heimdal-devel}
 
 %description devel
 C header files for the serf library.
@@ -65,6 +69,7 @@ Statyczne biblioteki serf.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal} -I build
@@ -72,6 +77,7 @@ Statyczne biblioteki serf.
 %configure \
 	--with-apr=%{_prefix} \
 	--with-apr-util=%{_prefix} \
+	%{?with_kerberos5:--with-gssapi=%{_prefix}} \
 	--with-openssl=%{_prefix}
 %{__make}
 
diff --git a/serf-link.patch b/serf-link.patch
new file mode 100644
index 0000000..1907243
--- /dev/null
+++ b/serf-link.patch
@@ -0,0 +1,13 @@
+--- serf-1.2.1/configure.in.orig	2013-06-06 15:24:17.713217048 +0200
++++ serf-1.2.1/configure.in	2013-06-06 15:33:22.779872353 +0200
+@@ -182,10 +182,8 @@
+     APR_ADDTO(CPPFLAGS, "-I${openssl_prefix}/include")
+     if test -e "${openssl_prefix}/Makefile"; then
+       APR_ADDTO(LDFLAGS, "-L${openssl_prefix}")
+-      APR_ADDTO(LDFLAGS, "-R${openssl_prefix}")
+     else
+       APR_ADDTO(LDFLAGS, "-L${openssl_prefix}/lib")
+-      APR_ADDTO(LDFLAGS, "-R${openssl_prefix}/lib")
+     fi
+   fi
+ ])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/serf.git/commitdiff/2a71e6bdf46f08b2132227fcab708b1e999d9787