diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 5fc92de..781e8e4 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -5,7 +5,7 @@ Summary: The Cyrus SASL library Name: cyrus-sasl Version: 2.1.22 -Release: 13%{?dist} +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 @@ Summary: SQL auxprop support for Cyrus SASL 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 @@ Summary: LDAP auxprop support for Cyrus SASL %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 @@ LDFLAGS=`echo $LDFLAGS $SQL_LDFLAGS | cleanup_flags`; export LDFLAGS --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 @@ LDFLAGS=`echo $LDFLAGS $SQL_LDFLAGS | cleanup_flags`; export LDFLAGS --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 @@ fi %{_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,12 @@ fi %{_sbindir}/sasl2-shared-mechlist %changelog +* Fri May 23 2008 Dennis Gilmore - 2.1.22-14 +- make it so that bootstrap actually works + +* Thu May 22 2008 Tom "spot" Callaway - 2.1.22-13.1 +- minor release bump for sparc rebuild + * Tue Feb 19 2008 Fedora Release Engineering - 2.1.22-13 - Autorebuild for GCC 4.3