X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=metaproxy.spec;h=948856c5d99e51238715dcac8bdfe3af2838448d;hb=2e628cd8033ffba8be20f95f26112e325ff82ddb;hp=eaf8f5ce247cc9c8e6ed42ecbd5bb5d9c1e9721b;hpb=d908bd814ae464d896adf1b280b897bfaac290bb;p=metaproxy-moved-to-github.git

diff --git a/metaproxy.spec b/metaproxy.spec
index eaf8f5c..948856c 100644
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -1,6 +1,7 @@
+%define idmetaversion %(. ./IDMETA; echo $VERSION|tr -d '\n')
 Summary: Z39.50/SRU router
 Name: metaproxy
-Version: 1.3.0
+Version: %{idmetaversion}
 Release: 1indexdata
 License: GPL
 Group: Applications/Internet
@@ -8,12 +9,12 @@ 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.3, libyazpp4-devel >= 1.2.6
+BuildRequires: pkgconfig, libyaz4-devel >= 4.2.14, libyazpp4-devel >= 1.2.7
 BuildRequires: libxslt-devel, boost-devel
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/metaproxy
 Group:  Applications/Internet
-# Requires: 
+Requires:  libmetaproxy4 = %{version}
 
 %description
 Metaproxy daemon.
@@ -29,6 +30,7 @@ Metaproxy documentation.
 Summary: Metaproxy library
 Group: Libraries
 Requires: libyazpp4
+Conflicts: libyaz4 = 4.2.18
 
 %description -n libmetaproxy4
 The Metaproxy libraries.
@@ -59,7 +61,7 @@ make prefix=${RPM_BUILD_ROOT}/%{_prefix} mandir=${RPM_BUILD_ROOT}/%{_mandir} \
 rm ${RPM_BUILD_ROOT}/%{_libdir}/*.la
 rm -fr ${RPM_BUILD_ROOT}/%{_prefix}/share/metaproxy
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy/*
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy/modules
+mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy4/modules
 mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/filters-enabled
 mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/filters-available
 mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
@@ -77,7 +79,7 @@ rm -fr ${RPM_BUILD_ROOT}
 %doc README LICENSE NEWS
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%dir %{_libdir}/metaproxy/modules
+%dir %{_libdir}/metaproxy4/modules
 
 %post -n libmetaproxy4 -p /sbin/ldconfig