From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 11 Jun 2014 08:46:22 +0000 (+0200)
Subject: Do not bundle libmemcached. Linking does not work for C
X-Git-Tag: v5.2.0~21
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=ae36e69eb7fa1ba7c8c10c7c41bf7e30dc861db4;p=yaz-moved-to-github.git

Do not bundle libmemcached. Linking does not work for C

Everybody using YAZ would have to switch to g++. And that doesn't
fly.
---

diff --git a/yaz.spec b/yaz.spec
index 8e10326..1b1acb5 100644
--- a/yaz.spec
+++ b/yaz.spec
@@ -47,7 +47,6 @@ BuildRequires: libxslt-devel
 BuildRequires: readline-devel
 BuildRequires: libicu-devel
 BuildRequires: wget
-BuildRequires: cyrus-sasl-devel
 BuildRequires: libgcrypt-devel
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/yaz
@@ -97,19 +96,12 @@ chain facility of YAZ.
 %prep
 %setup
 
-wget -q http://ftp.indexdata.dk/pub/support/libmemcached-1.0.18.tar.gz
-tar zxf libmemcached-1.0.18.tar.gz
-
 %build
 
-YD=`pwd`
-cd libmemcached-1.0.18
-./configure --disable-shared --prefix=${YD}/libmemcached
-make install
-cd ..
-PKG_CONFIG_PATH=${YD}/libmemcached/lib/pkgconfig CFLAGS="$RPM_OPT_FLAGS" \
+CFLAGS="$RPM_OPT_FLAGS" \
  ./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \
-	--enable-shared --enable-tcpd --with-xslt --with-gnutls --with-icu
+	--enable-shared --enable-tcpd --with-xslt --with-gnutls --with-icu \
+	--without-memcached
 make CFLAGS="$RPM_OPT_FLAGS"
 
 %install