[libmemcached] improves SASL patch

Remi Collet remi at fedoraproject.org
Tue Oct 5 16:02:59 UTC 2010


commit c80457e231a06384b0d579f281eb51726687181c
Author: remi <fedora at famillecollet.com>
Date:   Tue Oct 5 18:03:01 2010 +0200

    improves SASL patch

 libmemcached-sasl.patch |   12 ++++++++++++
 libmemcached.spec       |   11 ++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/libmemcached-sasl.patch b/libmemcached-sasl.patch
index 0ebb435..90bc3d1 100644
--- a/libmemcached-sasl.patch
+++ b/libmemcached-sasl.patch
@@ -1,3 +1,15 @@
+diff -up libmemcached-0.44/libmemcached/include.am.sasl libmemcached-0.44/libmemcached/include.am
+--- libmemcached-0.44/libmemcached/include.am.sasl	2010-10-02 16:34:33.000000000 +0200
++++ libmemcached-0.44/libmemcached/include.am	2010-10-02 16:35:27.000000000 +0200
+@@ -149,7 +149,7 @@ libmemcached_libmemcachedprotocol_la_DEP
+ endif
+ 
+ if HAVE_SASL
+-libmemcached_libmemcached_la_LDFLAGS+= $(LIBSASL)
++libmemcached_libmemcached_la_LIBADD += $(LTLIBSASL2)
+ libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
+ endif
+ 
 diff -up libmemcached-0.44/support/libmemcached.pc.in.sasl libmemcached-0.44/support/libmemcached.pc.in
 --- libmemcached-0.44/support/libmemcached.pc.in.sasl	2010-10-02 08:20:58.000000000 +0200
 +++ libmemcached-0.44/support/libmemcached.pc.in	2010-10-02 08:24:07.000000000 +0200
diff --git a/libmemcached.spec b/libmemcached.spec
index 4e1fb4c..bb1e282 100644
--- a/libmemcached.spec
+++ b/libmemcached.spec
@@ -1,7 +1,7 @@
 Name:      libmemcached
 Summary:   Client library and command line tools for memcached server
 Version:   0.44
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   BSD
 Group:     System Environment/Libraries
 URL:       http://libmemcached.org/
@@ -11,11 +11,12 @@ Source0:   http://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcach
 # See http://lists.libmemcached.org/pipermail/libmemcached-discuss/2010-October/002207.html
 Patch0:    libmemcached-sasl.patch
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cyrus-sasl-devel
 # checked during configure (for test suite)
 BuildRequires: memcached
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# We patch .m4 files
+BuildRequires: libtool autoconf automake
 
 
 %description
@@ -59,6 +60,7 @@ you will need to install %{name}-devel.
 
 
 %build
+config/autorun.sh
 %configure
 %{__make} %{_smp_mflags}
 
@@ -117,6 +119,9 @@ you will need to install %{name}-devel.
 
 
 %changelog
+* Sat Oct 02 2010 Remi Collet <Fedora at famillecollet.com> - 0.44-3
+- improves SASL patch
+
 * Sat Oct 02 2010 Remi Collet <Fedora at famillecollet.com> - 0.44-2
 - enable SASL support
 


More information about the scm-commits mailing list