[libmemcached] fix broken dep pkgconfig(arch) + update patch for SASL

[Remi Collet]

commit 7917d1541d0e40783149e650f0896bf848c1aa3f
Author: remi <fedora at famillecollet.com>
Date:   Sun Feb 20 16:17:28 2011 +0100

    fix broken dep pkgconfig(arch) + update patch for SASL

 libmemcached-sasl.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 libmemcached.spec       |   13 ++++++-------
 2 files changed, 46 insertions(+), 7 deletions(-)
---
diff --git a/libmemcached-sasl.patch b/libmemcached-sasl.patch
index 90bc3d1..104f60b 100644
--- a/libmemcached-sasl.patch
+++ b/libmemcached-sasl.patch
@@ -20,3 +20,43 @@ diff -up libmemcached-0.44/support/libmemcached.pc.in.sasl libmemcached-0.44/sup
 -Libs: -L${libdir} -lmemcached
 +Libs: @LTLIBSASL2@ -L${libdir} -lmemcached
  Cflags: -I${includedir}
+--- libmemcached-0.46/Makefile.in.orig	2011-02-19 17:54:29.000000000 +0100
++++ libmemcached-0.46/Makefile.in	2011-02-19 17:54:51.000000000 +0100
+@@ -113,7 +113,7 @@
+ @BUILD_BYTEORDER_TRUE at am__append_4 = libmemcached/libbyteorder.la
+ @BUILD_BYTEORDER_TRUE at am__append_5 = libmemcached/libbyteorder.la
+ @BUILD_BYTEORDER_TRUE at am__append_6 = libmemcached/libbyteorder.la
+- at HAVE_SASL_TRUE@am__append_7 = $(LIBSASL)
++ at HAVE_SASL_TRUE@am__append_7 = $(LTLIBSASL2)
+ @HAVE_SASL_TRUE at am__append_8 = libmemcached/sasl.c
+ @HAVE_DTRACE_TRUE at am__append_9 = libmemcached/dtrace_probes.h
+ @HAVE_DTRACE_TRUE at am__append_10 = libmemcached/dtrace_probes.h
+@@ -291,6 +291,7 @@
+ 	$(am_libmemcached_libbyteorder_la_OBJECTS)
+ @BUILD_BYTEORDER_TRUE at am_libmemcached_libbyteorder_la_rpath =
+ am__DEPENDENCIES_1 =
++ at HAVE_SASL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+ am__libmemcached_libmemcached_la_SOURCES_DIST =  \
+ 	libmemcached/allocators.c libmemcached/analyze.c \
+ 	libmemcached/auto.c libmemcached/behavior.c \
+@@ -396,7 +397,6 @@
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ am_clients_memcapable_OBJECTS = clients/memcapable.$(OBJEXT)
+ clients_memcapable_OBJECTS = $(am_clients_memcapable_OBJECTS)
+- at HAVE_SASL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+ am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) clients/libutilities.la \
+ 	libmemcached/libmemcached.la $(am__DEPENDENCIES_2)
+ clients_memcapable_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+@@ -974,9 +974,10 @@
+ libmemcached_libmemcached_la_LIBADD = $(LIBM) \
+ 	libmemcached/libmemcachedcallbacks.la \
+ 	libmemcached/libmemcachedinternal.la \
+-	libhashkit/libhashkitinc.la $(am__append_5) $(am__append_13)
++	libhashkit/libhashkitinc.la $(am__append_5) $(am__append_7) \
++	$(am__append_13)
+ libmemcached_libmemcached_la_LDFLAGS = ${AM_LDFLAGS} -version-info \
+-	${MEMCACHED_LIBRARY_VERSION} $(am__append_7) $(am__append_26)
++	${MEMCACHED_LIBRARY_VERSION} $(am__append_26)
+ libmemcached_libmemcachedutil_la_SOURCES = \
+ 					  libmemcached/util/ping.c \
+ 					  libmemcached/util/pool.c \
diff --git a/libmemcached.spec b/libmemcached.spec
index 968a030..90f635a 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.46
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   BSD
 Group:     System Environment/Libraries
 URL:       http://libmemcached.org/
@@ -21,10 +21,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cyrus-sasl-devel
 BuildRequires: systemtap-sdt-devel
 BuildRequires: libevent-devel
-# checked during configure (for test suite)
-#BuildRequires: memcached
-# We patch .m4 files
-BuildRequires: libtool autoconf automake
 
 
 %description
@@ -47,7 +43,7 @@ memerror - Creates human readable messages from libmemcached error codes.
 Summary: Header files and development libraries for %{name}
 Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pkgconfig%{?_isa}
+Requires: pkgconfig
 Requires: cyrus-sasl-devel%{?_isa}
 
 %description devel
@@ -66,7 +62,6 @@ you will need to install %{name}-devel.
 
 
 %build
-config/autorun.sh
 # option --with-memcached=false to disable server binary check (as we don't run test)
 %configure --with-memcached=false
 %{__make} %{_smp_mflags}
@@ -126,6 +121,10 @@ config/autorun.sh
 
 
 %changelog
+* Sun Feb 20 2011 Remi Collet <Fedora at famillecollet.com> - 0.46-2
+- patch Makefile.in instead of include.am (to avoid autoconf)
+- donc requires pkgconfig with arch
+
 * Fri Feb 18 2011 Remi Collet <Fedora at famillecollet.com> - 0.46-1
 - update to 0.46