From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 5 Dec 2011 11:34:59 +0000 (+0100)
Subject: Require YAZ 4.2.22 or later
X-Git-Tag: v1.3.18~14
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=22b142c281f87fe0fee7bb11c907943c6a9f631f;p=metaproxy-moved-to-github.git

Require YAZ 4.2.22 or later
---

diff --git a/configure.ac b/configure.ac
index d647aa8..5cb6340 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,11 +43,11 @@ if test -z "$YAZPPLIB"; then
     AC_MSG_ERROR([YAZ++ development libraries missing])
 fi
 CPPFLAGS="$YAZPPINC $CPPFLAGS"
-AC_MSG_CHECKING([if YAZ is version 4.2.14 or later])
+AC_MSG_CHECKING([if YAZ is version 4.2.22 or later])
 AC_COMPILE_IFELSE(
         [AC_LANG_PROGRAM([[#include <yaz/yaz-version.h>]],
                          [[
-#if YAZ_VERSIONL < 0x4020e
+#if YAZ_VERSIONL < 0x40216
 #error too old
 #endif
 ]])],
diff --git a/debian/control b/debian/control
index 2acde61..cad2e8a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Standards-Version: 3.6.2
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Priority: extra
 Build-Depends: debhelper (>= 4),
-	libyaz4-dev (>= 4.2.14),
+	libyaz4-dev (>= 4.2.22),
 	libyazpp4-dev (>= 1.2.7),
 	libxslt1-dev,
 	libboost-dev,
@@ -28,8 +28,7 @@ Description: Z39.50/SRU router (main executable)
 Package: libmetaproxy4
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libyaz4 (= 4.2.18)
+Depends: ${shlibs:Depends}, libyaz4 (>= 4.2.22)
 Description: Z39.50/SRU router (runtime)
  This is a universal router, proxy and encapsulated metasearcher
  for information retrieval protocols. It accepts, processes, interprets
diff --git a/metaproxy.spec b/metaproxy.spec
index 948856c..3bdccb3 100644
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -9,7 +9,7 @@ Vendor: Index Data ApS <info@indexdata.dk>
 Source: metaproxy-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix} /etc/metaproxy
-BuildRequires: pkgconfig, libyaz4-devel >= 4.2.14, libyazpp4-devel >= 1.2.7
+BuildRequires: pkgconfig, libyaz4-devel >= 4.2.22, libyazpp4-devel >= 1.2.7
 BuildRequires: libxslt-devel, boost-devel
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/metaproxy
@@ -29,8 +29,7 @@ Metaproxy documentation.
 %package -n libmetaproxy4
 Summary: Metaproxy library
 Group: Libraries
-Requires: libyazpp4
-Conflicts: libyaz4 = 4.2.18
+Requires: libyazpp4, libyaz4 >= 4.2.22
 
 %description -n libmetaproxy4
 The Metaproxy libraries.