commit 1a91d275c8f9049fdb61e69e11947572385becc2
Author: Jakub Bogusz <[email protected]>
Date: Sat Dec 6 18:54:54 2014 +0100
- updated to 1.0.18
libmemcached-memcached.patch | 22 ----------------------
libmemcached.spec | 14 ++++----------
2 files changed, 4 insertions(+), 32 deletions(-)
---
diff --git a/libmemcached.spec b/libmemcached.spec
index d18802b..ad83787 100644
--- a/libmemcached.spec
+++ b/libmemcached.spec
@@ -8,13 +8,12 @@
Summary: memcached client library
Summary(pl.UTF-8): Blblioteka kliencka memcached
Name: libmemcached
-Version: 1.0.17
+Version: 1.0.18
Release: 1
License: BSD
Group: Libraries
-Source0:
http://launchpad.net/libmemcached/1.0/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5: d1a34be4d65b5e12dffcbb7763003056
-Patch0: %{name}-memcached.patch
+Source0:
https://launchpad.net/libmemcached/1.0/%{version}/+download/%{name}-%{version}.tar.gz
+# Source0-md5: b3958716b4e53ddc5992e6c49d97e819
URL: http://libmemcached.org/
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
@@ -23,7 +22,6 @@ BuildRequires: libevent-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:2.2
BuildRequires: perl-tools-pod
-BuildRequires: sed >= 4.0
BuildRequires: sphinx-pdg
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -66,10 +64,6 @@ Statyczna biblioteka memcached.
%prep
%setup -q
-%patch0 -p1
-
-# don't enable all posible sanitizers (conflicting with others)
-%{__sed} -i -e '/-fsanitize=/d' m4/ax_harden_compiler_flags.m4
%build
%{__libtoolize}
@@ -85,7 +79,7 @@ Statyczna biblioteka memcached.
--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
diff --git a/libmemcached-memcached.patch b/libmemcached-memcached.patch
deleted file mode 100644
index b960c80..0000000
--- a/libmemcached-memcached.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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/1a91d275c8f9049fdb61e69e11947572385becc2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
