From ae36e69eb7fa1ba7c8c10c7c41bf7e30dc861db4 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 11 Jun 2014 10:46:22 +0200 Subject: [PATCH] Do not bundle libmemcached. Linking does not work for C Everybody using YAZ would have to switch to g++. And that doesn't fly. --- yaz.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) 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 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 -- 1.7.10.4