rpms/cyrus-sasl/F-9 cyrus-sasl.spec,1.67,1.68

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/pkgs/rpms/cyrus-sasl/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27962

Modified Files:
	cyrus-sasl.spec 
Log Message:
make it so that bootstraping works 



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-9/cyrus-sasl.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- cyrus-sasl.spec	22 May 2008 21:47:03 -0000	1.67
+++ cyrus-sasl.spec	23 May 2008 18:41:35 -0000	1.68
@@ -5,7 +5,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 13%{?dist}.1
+Release: 14%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -108,6 +108,7 @@
 The %{name}-sql package contains the Cyrus SASL plugin which supports
 using a RDBMS for storing shared secrets.
 
+%if ! %{bootstrap_cyrus_sasl}
 # This was *almost* named cyrus-sasl-auxprop-ldapdb, but that's a lot of typing.
 %package ldap
 Requires: %{name}-lib = %{version}-%{release}
@@ -117,6 +118,7 @@
 %description ldap
 The %{name}-ldap package contains the Cyrus SASL plugin which supports using
 a directory server, accessed using LDAP, for storing shared secrets.
+%endif
 
 %prep
 %setup -q -a 6
@@ -227,7 +229,9 @@
         --with-bdb-incdir=${topdir}/db-instroot/include \
         --with-bdb-libdir=${topdir}/db-instroot/lib \
         --with-saslauthd=/var/run/saslauthd --without-pwcheck \
+%if ! %{bootstrap_cyrus_sasl}
         --with-ldap \
+%endif
         --with-devrandom=/dev/urandom \
         --enable-anon \
         --enable-cram \
@@ -236,7 +240,9 @@
         --enable-plain \
         --enable-login \
         --disable-otp \
+%if ! %{bootstrap_cyrus_sasl}
         --enable-ldapdb \
+%endif
         --enable-sql --with-mysql=%{_prefix} --with-pgsql=%{_prefix} \
         --without-sqlite \
         "$@"
@@ -341,9 +347,11 @@
 %{_plugindir2}/*plain*.so*
 %{_plugindir2}/*login*.so*
 
+%if ! %{bootstrap_cyrus_sasl}
 %files ldap
 %defattr(-,root,root)
 %{_plugindir2}/*ldapdb*.so*
+%endif
 
 %files md5
 %defattr(-,root,root)
@@ -373,6 +381,9 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri May 23 2008 Dennis Gilmore <dennis at ausil.us> - 2.1.22-14
+- make it so that bootstrap actually works
+
 * Thu May 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.22-13.1
 - minor release bump for sparc rebuild