From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 30 Mar 2012 11:14:00 +0000 (+0200)
Subject: Metaproxy conflicts with CF 2.12.5 and earlier
X-Git-Tag: v1.3.27~1
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=f0c871ff728c47822c48e275cd9e9d147b74fa31;p=metaproxy-moved-to-github.git

Metaproxy conflicts with CF 2.12.5 and earlier

This is because Metaproxy is running as a different user now -
and old lock files etc, previously created as "nobody" would cause
permission problems for CF.
---

diff --git a/debian/control b/debian/control
index 321c606..9d89187 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Package: metaproxy
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, libmetaproxy4 (= ${Source-Version})
+Conflicts: cf-engine (<= 2.12.5)
 Description: Z39.50/SRU router (main executable)
  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 62e075a..6e5a252 100644
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix} /etc/metaproxy
 BuildRequires: pkgconfig, libyaz4-devel >= 4.2.27, libyazpp4-devel >= 1.2.7
 BuildRequires: libxslt-devel, boost-devel
+Conflicts: cf-engine <= 2.12.5
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/metaproxy
 Group:  Applications/Internet