[packages/libmemcached] - updated to 1.0.17 - added memcached patch (fixes build without memcached daemon installed)

[qboosh]

commit b048042dadcfd3c12e96800191509d434e0c66b2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Nov 10 07:42:54 2013 +0100

    - updated to 1.0.17
    - added memcached patch (fixes build without memcached daemon installed)

 libmemcached-memcached.patch | 22 ++++++++++++++++++++++
 libmemcached.spec            | 27 ++++++++++++++++++---------
 2 files changed, 40 insertions(+), 9 deletions(-)
---
diff --git a/libmemcached.spec b/libmemcached.spec
index 821c46f..42792d7 100644
--- a/libmemcached.spec
+++ b/libmemcached.spec
@@ -8,20 +8,22 @@
 Summary:	memcached client library
 Summary(pl.UTF-8):	Blblioteka kliencka memcached
 Name:		libmemcached
-Version:	1.0.16
+Version:	1.0.17
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://launchpad.net/libmemcached/1.0/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5:	1f3a7d559714791ac04ce8bcccc6b67e
+# Source0-md5:	d1a34be4d65b5e12dffcbb7763003056
+Patch0:		%{name}-memcached.patch
 URL:		http://libmemcached.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	libevent-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.2
 BuildRequires:	perl-tools-pod
+BuildRequires:	sphinx-pdg
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -63,6 +65,7 @@ Statyczna biblioteka memcached.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -71,11 +74,14 @@ Statyczna biblioteka memcached.
 %{__autoheader}
 %{__automake}
 %configure \
-	LIBS="-lrt -lsasl -lpthread" \
-	%{?with_static_libs:--enable-static} \
-	--disable-silent-rules \
+	PTHREAD_CFLAGS="-pthread" \
+	PTHREAD_LIBS="-lpthread" \
+	--enable-dtrace \
 	--enable-libmemcachedprotocol \
+	--disable-silent-rules \
+	%{?with_static_libs:--enable-static} \
 	--with-memcached=no # disable memcached detection, we're not doing tests
+#	LIBS="-lrt -lsasl -lpthread" 
 %{__make}
 
 %install
@@ -134,7 +140,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libmemcachedutil-1.0
 %{_pkgconfigdir}/libmemcached.pc
 %{_aclocaldir}/ax_libmemcached.m4
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/hashkit_*.3*
+%{_mandir}/man3/libhashkit.3*
+%{_mandir}/man3/libmemcached*.3*
+%{_mandir}/man3/memcached*.3*
 
 %if %{with static_libs}
 %files static
diff --git a/libmemcached-memcached.patch b/libmemcached-memcached.patch
new file mode 100644
index 0000000..b960c80
--- /dev/null
+++ b/libmemcached-memcached.patch
@@ -0,0 +1,22 @@
+--- libmemcached-1.0.17/m4/ax_memcached.m4.orig	2013-04-03 06:22:00.000000000 +0200
++++ libmemcached-1.0.17/m4/ax_memcached.m4	2013-11-09 22:54:27.206037326 +0100
+@@ -54,5 +54,5 @@
+       ax_memcached_version=`$MEMCACHED_BINARY -h | sed 1q | awk '{print \$ 2 }' | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'`
+       AC_MSG_RESULT([memcached version "$ax_memcached_version"])
+       AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])
+-      ])
++      ],[AC_DEFINE([HAVE_MEMCACHED_BINARY], [0], [If Memcached binary is available])])
+     ])
+--- libmemcached-1.0.17/libtest/memcached.cc.orig	2013-04-03 06:22:00.000000000 +0200
++++ libmemcached-1.0.17/libtest/memcached.cc	2013-11-09 23:11:02.539328893 +0100
+@@ -58,6 +58,10 @@
+ #pragma GCC diagnostic ignored "-Wold-style-cast"
+ #endif
+ 
++#ifndef MEMCACHED_BINARY
++#define MEMCACHED_BINARY "memcached"
++#endif
++
+ namespace libtest {
+ 
+ class Memcached : public libtest::Server
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmemcached.git/commitdiff/b048042dadcfd3c12e96800191509d434e0c66b2