X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz.spec;h=3ec25e7dcce9ce7d8caeeca3b39390a2f74fd5ea;hp=b977565f8f2bc5f4ac99e9923daf66c931f0fe01;hb=81358822816ed75a14af31a0656550de1329c33a;hpb=473824797f568578dc17d7242551cb2f7ccef46c

diff --git a/yaz.spec b/yaz.spec
index b977565..3ec25e7 100644
--- a/yaz.spec
+++ b/yaz.spec
@@ -4,18 +4,19 @@
 #
 # spec file for YAZ
 
-%define idmetaversion %(. ./IDMETA; echo $VERSION|tr -d '\n')
+%define idmetaversion %(. ./IDMETA; echo $VERSION)
 Name: yaz
 Summary: Z39.50 Programs
 Version: %{idmetaversion}
 Release: 1.indexdata
 
 # determine system
+%define is_redhat5 %(grep 'release 5' /etc/redhat-release >/dev/null 2>&1 && echo 1 || echo 0)
 %define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
 %define is_suse %(test -e /etc/SuSE-release >/dev/null && echo 1 || echo 0)
 %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: readline, libyaz5 = %{version}
 License: BSD
 Group: Applications/Internet
 Vendor: Index Data ApS <info@indexdata.dk>
@@ -23,10 +24,10 @@ Source: yaz-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix}
 
-%define TCPWRAPPER tcp_wrappers
-
-%if %is_fedora
 %define TCPWRAPPER tcp_wrappers-devel
+
+%if %is_redhat5
+%define TCPWRAPPER tcp_wrappers
 %endif
 
 %if %is_suse
@@ -46,6 +47,11 @@ BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
 BuildRequires: readline-devel
 BuildRequires: libicu-devel
+BuildRequires: wget
+%if %is_redhat5
+%else
+BuildRequires: hiredis-devel
+%endif
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/yaz
 
@@ -57,6 +63,10 @@ for the ANSI/NISO Z39.50 protocol for Information Retrieval.
 Summary: Z39.50 Library
 Group: Libraries
 Requires: libxslt, gnutls, libicu
+%if %is_redhat5
+%else
+Requires: hiredis
+%endif
 
 %description -n libyaz5
 YAZ is a library for the ANSI/NISO Z39.50 protocol for Information
@@ -98,7 +108,8 @@ chain facility of YAZ.
 
 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
@@ -111,7 +122,7 @@ rm -fr ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root)
-%doc README LICENSE NEWS
+%doc README.md LICENSE NEWS
 %{_bindir}/yaz-client
 %{_bindir}/yaz-ztest
 %{_bindir}/zoomsh