X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz.spec;h=61e863c38922bdf865659faedbfca4a183059334;hp=d67d528a56fb2b965af5a6a042a664f8a84daa34;hb=2a624ff1daa841601aebca86c0196039da6978b3;hpb=c18a5a0c2620b67650b51255ea3139378ac64cec

diff --git a/yaz.spec b/yaz.spec
index d67d528..61e863c 100644
--- a/yaz.spec
+++ b/yaz.spec
@@ -4,19 +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: 4.redis
+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: hiredis
+Requires: readline, libyaz5 = %{version}
 License: BSD
 Group: Applications/Internet
 Vendor: Index Data ApS <info@indexdata.dk>
@@ -24,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
@@ -49,7 +49,10 @@ BuildRequires: readline-devel
 BuildRequires: libicu-devel
 BuildRequires: wget
 BuildRequires: libgcrypt-devel
+%if %is_redhat5
+%else
 BuildRequires: hiredis-devel
+%endif
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/yaz
 
@@ -61,6 +64,10 @@ for the ANSI/NISO Z39.50 protocol for Information Retrieval.
 Summary: Z39.50 Library
 Group: Libraries
 Requires: libxslt, gnutls, libicu, libgcrypt
+%if %is_redhat5
+%else
+Requires: hiredis
+%endif
 
 %description -n libyaz5
 YAZ is a library for the ANSI/NISO Z39.50 protocol for Information
@@ -103,7 +110,7 @@ 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 \
-	--without-memcached --with-redis
+	--without-memcached
 make CFLAGS="$RPM_OPT_FLAGS"
 
 %install