X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz.spec;h=d67d528a56fb2b965af5a6a042a664f8a84daa34;hp=8e6ea589edb2cd9b7d3c74a405cdc7f76a2eea8e;hb=e2b8bf88befb43e4a189ce3e659c595e5b3af7dc;hpb=9300aa0c18c95a88fe9f16dc3660122d5e1d95a1

diff --git a/yaz.spec b/yaz.spec
index 8e6ea58..d67d528 100644
--- a/yaz.spec
+++ b/yaz.spec
@@ -8,7 +8,7 @@
 Name: yaz
 Summary: Z39.50 Programs
 Version: %{idmetaversion}
-Release: 1.indexdata
+Release: 4.redis
 
 # determine system
 %define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
@@ -16,6 +16,7 @@ Release: 1.indexdata
 %define is_suse11 %(grep 'VERSION = 11' /etc/SuSE-release >/dev/null 2>&1 && echo 1 || echo 0)
 %define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
 Requires: libxslt, gnutls, readline, libyaz5 = %{version}
+Requires: hiredis
 License: BSD
 Group: Applications/Internet
 Vendor: Index Data ApS <info@indexdata.dk>
@@ -47,8 +48,8 @@ BuildRequires: libxslt-devel
 BuildRequires: readline-devel
 BuildRequires: libicu-devel
 BuildRequires: wget
-BuildRequires: cyrus-sasl-devel
 BuildRequires: libgcrypt-devel
+BuildRequires: hiredis-devel
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/yaz
 
@@ -59,7 +60,7 @@ for the ANSI/NISO Z39.50 protocol for Information Retrieval.
 %package -n libyaz5
 Summary: Z39.50 Library
 Group: Libraries
-Requires: libxslt, gnutls, libicu, libmemcached, libgcrypt
+Requires: libxslt, gnutls, libicu, libgcrypt
 
 %description -n libyaz5
 YAZ is a library for the ANSI/NISO Z39.50 protocol for Information
@@ -97,19 +98,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 --with-redis
 make CFLAGS="$RPM_OPT_FLAGS"
 
 %install