rpm/libmemcached
SHA256
1
0
Fork 0
forked from pool/libmemcached
Code Pull Requests Activity

Accepting request 228318 from home:lrupp:branches:devel:libraries:c_c++

Browse Source 
- update to 1.0.18:
  + MEMCACHED_BEHAVIOR_RETRY_TIMEOUT can now be set to zero.
  + Numerous bug fixes.
- remove upstreamed patch libmemcached-with-memcached.patch
- remove outdated dist version dependencies, (build)require the 
  needed automake >= 1.13 instead

OBS-URL: https://build.opensuse.org/request/show/228318
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmemcached?expand=0&rev=43
This commit is contained in:
Sascha Peilicke 2014-04-01 08:29:04 +00:00 committed by Git OBS Bridge
parent 711c1fbca4
commit c8dca23811
7 changed files with 29 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmemcached-1.0.17.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7bb27b2589400f918df1cf5002cb01ef7ccac6e23f818604e2386de62c80bba5
size 1023177

12
libmemcached-1.0.17.tar.gz.asc
View File

@ -1,12 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
Comment: GPGTools - http://gpgtools.org
iQEcBAABAgAGBQJRW7gIAAoJEItO41/aJIgTY90H+wVU93/1yV/0uIWmxJRu1Br+
LERG7TbRjRzThOew5l27It9s9xLDgEhVro8S9xYrOdpZgkWYnmsRLkWXEs9g0xSR
U+CDrWbTPsJZO+MZ2//uAh3+KU9GRmnXSQB2fdh/HU4HaaqPDc+zJrLHbKy2IvOb
sqv+wXi9I6W9GmslQ3EbwHb6xKueCNUYB6T+IRu6dqDb4b+pOg1XVYPs7bz+dZ6e
sqD7Jn/x0VQigrqwIveMG0vtdp/Nz7BkM4gJzbQHiw3PbuNqF1gtwTlQafi6whAs
BEb4mRgw5xSAGGjxFGzJ8ciVq70QYPRLjARiAxEBBEoLmOvq/Ii9cJjCTZI7XBc=
=eJ2d
-----END PGP SIGNATURE-----

3
libmemcached-1.0.18.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82
size 1039649

12
libmemcached-1.0.18.tar.gz.asc Normal file
View File

@ -0,0 +1,12 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
Comment: GPGTools - http://gpgtools.org
iQEcBAABAgAGBQJS93MtAAoJEItO41/aJIgTP/kIALky/54J/sO2nGrbh6jQh2m3
kFzv3MGhvsBCybdBE9AmVeMQGKsbpnwQMQ66vWPn093JGsqTFmaSS0vXWYqnJbXN
t7p+mecw2/T6FUdfk8o0ZvV5I1xZgoyJUFlJnLWXQ1TGtdYuac88As5HK5VlNX1K
WTamqBP3SphNGfnCs2igKlUCW1JSgeByR/F2dqT3LadR9fAp/GpIeLayZKpLExjk
+zeN9EGRY0QXCImf5WN5pqS/qy/vjRc/nZviiHcS74niNqWVJtEx1724DMGBN8qZ
EiN4/1zXltdtcwkgUrMseqjAX8Q5CGu+L4smmG/Y0U2LLPx09AYfnRnSbUacFAA=
=m2pf
-----END PGP SIGNATURE-----

42
libmemcached-with-memcached.patch
View File

@ -1,42 +0,0 @@
=== modified file 'm4/ax_memcached.m4'
Index: m4/ax_memcached.m4
===================================================================
--- m4/ax_memcached.m4.orig
+++ m4/ax_memcached.m4
@@ -44,15 +44,26 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#serial 3
+#serial 4
AC_DEFUN([AX_PROG_MEMCACHED],
- [AX_WITH_PROG([MEMCACHED_BINARY],[memcached])
- AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"],
- [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
- AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$ac_cv_path_MEMCACHED_BINARY",[Name of the memcached binary used in make test])
- 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])
- ])
- ])
+ [AX_WITH_PROG([MEMCACHED_BINARY],[memcached],[unknown])
+ ax_memcached_success=
+ AS_IF([test x"$MEMCACHED_BINARY" != xunknown],
+ [AS_IF([test -x "$MEMCACHED_BINARY"],
+ [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}'`
+ AS_IF([test -n "$ax_memcached_version"],
+ [ax_memcached_success='ok'
+ AC_MSG_RESULT([memcached version "$ax_memcached_version"])
+ AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])])
+ ])
+ ])
+
+ AS_IF([test -n "$ax_memcached_success"],
+ [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
+ AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$MEMCACHED_BINARY",[Name of the memcached binary used in make test])
+ ],
+ [AC_DEFINE([HAVE_MEMCACHED_BINARY], [0], [If Memcached binary is available])
+ MEMCACHED_BINARY=
+ ])
+ ])

10
libmemcached.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Mar 31 10:46:47 UTC 2014 - lars@linux-schulserver.de
- update to 1.0.18:
+ MEMCACHED_BEHAVIOR_RETRY_TIMEOUT can now be set to zero.
+ Numerous bug fixes.
- remove upstreamed patch libmemcached-with-memcached.patch
- remove outdated dist version dependencies, (build)require the
needed automake >= 1.13 instead
-------------------------------------------------------------------
Sat Jan 4 23:08:40 UTC 2014 - dmueller@suse.com

17
libmemcached.spec
View File

@ -21,7 +21,7 @@ Name: libmemcached
Summary: A C and C++ client library to the memcached server
License: BSD-3-Clause
Group: Development/Libraries/C and C++
Version: 1.0.17
Version: 1.0.18
Release: 0
Url: http://libmemcached.org
Source0: https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz
@ -29,25 +29,20 @@ Source1: https://launchpad.net/libmemcached/1.0/%{version}/+download/libm
Source2: %{name}.keyring
# PATCH-FIX-UPSTREAM libmemcached-pthread.patch lp#133614 dimstar@opensuse.org -- Fix pthread detection
Patch0: libmemcached-pthread.patch
# PATCH-FIX-UPSTREAM libmemcached-with-memcached.patch -- Fix --with-memchached bug: 'HAVE_MEMCACHED_BINARY' was not declared in this scope
Patch1: libmemcached-with-memcached.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# List of additional build dependencies
BuildRequires: automake >= 1.13
BuildRequires: bison
BuildRequires: cyrus-sasl-devel
BuildRequires: gcc-c++
BuildRequires: gpg-offline
BuildRequires: libevent-devel
BuildRequires: libtool
BuildRequires: memcached
BuildRequires: pkgconfig
# needed for man pages
#if 0%{?suse_version} > 1110
BuildRequires: python-sphinx
#endif
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
BuildRequires: gpg-offline
BuildRequires: python-Sphinx
%description
Libmemcached is a C and C++ client library to the memcached server
@ -98,7 +93,6 @@ methods.
%gpg_verify %{S:1}
%setup -q
%patch0
%patch1
%build
autoreconf -fiv
@ -119,9 +113,6 @@ make CFLAGS="-std=c99 %optflags" CXXFLAGS="%optflags" %{?_smp_mflags}
# remove not needed files
%{__rm} -f %{buildroot}/usr/share/aclocal/ax_libmemcached.m4
#%check
#make check
%post -n %{libsoname} -p /sbin/ldconfig
%postun -n %{libsoname} -p /sbin/ldconfig