make bootstrapping work

This commit is contained in:
Dennis Gilmore 2008-05-23 18:47:45 +00:00
parent f562e3a1c9
commit 6779c4ca10

View File

@ -5,7 +5,7 @@
Summary: The Cyrus SASL library Summary: The Cyrus SASL library
Name: cyrus-sasl Name: cyrus-sasl
Version: 2.1.22 Version: 2.1.22
Release: 13%{?dist} Release: 14%{?dist}
License: BSD License: BSD
Group: System Environment/Libraries Group: System Environment/Libraries
# Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/; # 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 The %{name}-sql package contains the Cyrus SASL plugin which supports
using a RDBMS for storing shared secrets. 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. # This was *almost* named cyrus-sasl-auxprop-ldapdb, but that's a lot of typing.
%package ldap %package ldap
Requires: %{name}-lib = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release}
@ -117,6 +118,7 @@ Summary: LDAP auxprop support for Cyrus SASL
%description ldap %description ldap
The %{name}-ldap package contains the Cyrus SASL plugin which supports using The %{name}-ldap package contains the Cyrus SASL plugin which supports using
a directory server, accessed using LDAP, for storing shared secrets. a directory server, accessed using LDAP, for storing shared secrets.
%endif
%prep %prep
%setup -q -a 6 %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-incdir=${topdir}/db-instroot/include \
--with-bdb-libdir=${topdir}/db-instroot/lib \ --with-bdb-libdir=${topdir}/db-instroot/lib \
--with-saslauthd=/var/run/saslauthd --without-pwcheck \ --with-saslauthd=/var/run/saslauthd --without-pwcheck \
%if ! %{bootstrap_cyrus_sasl}
--with-ldap \ --with-ldap \
%endif
--with-devrandom=/dev/urandom \ --with-devrandom=/dev/urandom \
--enable-anon \ --enable-anon \
--enable-cram \ --enable-cram \
@ -236,7 +240,9 @@ LDFLAGS=`echo $LDFLAGS $SQL_LDFLAGS | cleanup_flags`; export LDFLAGS
--enable-plain \ --enable-plain \
--enable-login \ --enable-login \
--disable-otp \ --disable-otp \
%if ! %{bootstrap_cyrus_sasl}
--enable-ldapdb \ --enable-ldapdb \
%endif
--enable-sql --with-mysql=%{_prefix} --with-pgsql=%{_prefix} \ --enable-sql --with-mysql=%{_prefix} --with-pgsql=%{_prefix} \
--without-sqlite \ --without-sqlite \
"$@" "$@"
@ -341,9 +347,11 @@ fi
%{_plugindir2}/*plain*.so* %{_plugindir2}/*plain*.so*
%{_plugindir2}/*login*.so* %{_plugindir2}/*login*.so*
%if ! %{bootstrap_cyrus_sasl}
%files ldap %files ldap
%defattr(-,root,root) %defattr(-,root,root)
%{_plugindir2}/*ldapdb*.so* %{_plugindir2}/*ldapdb*.so*
%endif
%files md5 %files md5
%defattr(-,root,root) %defattr(-,root,root)
@ -373,6 +381,12 @@ fi
%{_sbindir}/sasl2-shared-mechlist %{_sbindir}/sasl2-shared-mechlist
%changelog %changelog
* Fri May 23 2008 Dennis Gilmore <dennis@ausil.us> - 2.1.22-14
- make it so that bootstrap actually works
* Thu May 22 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.1.22-13.1
- minor release bump for sparc rebuild
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.1.22-13 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.1.22-13
- Autorebuild for GCC 4.3 - Autorebuild for GCC 4.3