commit 0eeff85e8297046182fd6f5cc2ba592d3a12ed49
Author: remi <fedora at famillecollet.com>
Date: Sun Oct 16 09:16:34 2011 +0200
update to 0.53
.gitignore | 1 +
libmemcached.spec | 25 +++++++++++++++++--------
nohsieh.cc | 7 +++++++
sources | 2 +-
4 files changed, 26 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3fd3d3d..095d91f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/libmemcached-0.49-exhsieh.tar.gz
/libmemcached-0.51-exhsieh.tar.gz
/libmemcached-0.52-exhsieh.tar.gz
+/libmemcached-0.53-exhsieh.tar.gz
diff --git a/libmemcached.spec b/libmemcached.spec
index 2d04834..13052a6 100644
--- a/libmemcached.spec
+++ b/libmemcached.spec
@@ -2,7 +2,7 @@
Name: libmemcached
Summary: Client library and command line tools for memcached server
-Version: 0.52
+Version: 0.53
Release: 1%{?dist}
License: BSD
Group: System Environment/Libraries
@@ -15,6 +15,9 @@ URL: http://libmemcached.org/
# "-exhsieh" tarball.
Source0: libmemcached-%{version}-exhsieh.tar.gz
+# http://lists.libmemcached.org/pipermail/libmemcached-discuss/2011-October/002292.html
+Source1: nohsieh.cc
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cyrus-sasl-devel
%if %{with_tests}
@@ -60,8 +63,11 @@ you will need to install %{name}-devel.
%prep
%setup -q
-%{__mkdir} examples
-%{__cp} -p tests/*.{cc,cpp,h} examples/
+mkdir examples
+cp -p tests/*.{cc,cpp,h} examples/
+
+# Temporary workaround for mandatory file
+cp %{SOURCE1} libhashkit/hsieh.cc
%build
@@ -71,12 +77,12 @@ you will need to install %{name}-devel.
--with-memcached=false
%endif
-%{__make} %{_smp_mflags}
+make %{_smp_mflags}
%install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
+rm -rf %{buildroot}
+make install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
%check
@@ -84,14 +90,14 @@ you will need to install %{name}-devel.
# test suite cannot run in mock (same port use for memcache servers on all arch)
# All tests completed successfully
# diff output.res output.cmp fails but result depend on server version
-%{__make} test
+make test
%else
echo 'Test suite disabled (missing "--with tests" option)'
%endif
%clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
@@ -129,6 +135,9 @@ echo 'Test suite disabled (missing "--with tests" option)'
%changelog
+* Sun Oct 16 2011 Remi Collet <remi at fedoraproject.org> - 0.53-1
+- update to 0.53
+
* Sat Sep 17 2011 Remi Collet <remi at fedoraproject.org> - 0.52-1
- update to 0.52
diff --git a/nohsieh.cc b/nohsieh.cc
new file mode 100644
index 0000000..af89e1a
--- /dev/null
+++ b/nohsieh.cc
@@ -0,0 +1,7 @@
+#include <libhashkit/common.h>
+
+#ifdef HAVE_HSIEH_HASH
+#error "not supported"
+#else
+uint32_t hashkit_hsieh(const char *, size_t , void *) { return 0; }
+#endif
diff --git a/sources b/sources
index 031bcbc..cea81d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-869be673510560bfe81e4b372154b553 libmemcached-0.52-exhsieh.tar.gz
+b23358cfa41fec77cbc0174475bc7779 libmemcached-0.53-exhsieh.tar.gz