From a660cec605c5c07a6f80426191d0faf2fdefad54 Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Wed, 17 Mar 2010 03:07:27 +0000 Subject: [PATCH] - add Conflicts to ensure we get fixed cyrus-sasl-lib for rev 21 change. --- autofs.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/autofs.spec b/autofs.spec index 9e531c5..6a7b2a7 100644 --- a/autofs.spec +++ b/autofs.spec @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.5 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 1 License: GPLv2+ Group: System Environment/Daemons @@ -35,6 +35,7 @@ Patch22: autofs-5.0.5-fix-reconnect-get-base-dn.patch Patch23: autofs-5.0.5-add-sasl-mutex-callbacks.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel +Conflicts: cyrus-sasl-lib < 2.1.23-9 Requires: kernel >= 2.6.17 Requires: bash mktemp sed gawk textutils sh-utils grep module-init-tools /bin/ps Requires(post): /sbin/chkconfig @@ -149,6 +150,9 @@ fi %{_libdir}/autofs/ %changelog +* Wed Mar 17 2010 Ian Kent - 1:5.0.5-22 +- add Conflicts to ensure we get fixed cyrus-sasl-lib for rev 21 change. + * Tue Feb 23 2010 Ian Kent - 1:5.0.5-21 - add missing sasl mutex callbacks.