re-enable libdb support and utilities

This commit is contained in:
Jindrich Novy 2012-04-16 16:41:15 +02:00
parent 8a263294df
commit cf05d06586

View File

@ -8,7 +8,7 @@
Summary: The Cyrus SASL library Summary: The Cyrus SASL library
Name: cyrus-sasl Name: cyrus-sasl
Version: 2.1.23 Version: 2.1.23
Release: 31%{?dist} Release: 32%{?dist}
License: BSD with advertising License: BSD with advertising
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/;
@ -51,7 +51,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, automake, libtool, gdbm-devel, groff BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
BuildRequires: mysql-devel, postgresql-devel, zlib-devel BuildRequires: mysql-devel, postgresql-devel, zlib-devel
#BuildRequires: libdb-devel BuildRequires: libdb-devel
%if ! %{bootstrap_cyrus_sasl} %if ! %{bootstrap_cyrus_sasl}
BuildRequires: openldap-devel BuildRequires: openldap-devel
%endif %endif
@ -259,7 +259,7 @@ echo "$LDFLAGS"
--enable-gssapi${krb5_prefix:+=${krb5_prefix}} \ --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
--with-gss_impl=mit \ --with-gss_impl=mit \
--with-rc4 \ --with-rc4 \
--with-dblib=no \ --with-dblib=berkeley \
--with-saslauthd=/run/saslauthd --without-pwcheck \ --with-saslauthd=/run/saslauthd --without-pwcheck \
%if ! %{bootstrap_cyrus_sasl} %if ! %{bootstrap_cyrus_sasl}
--with-ldap \ --with-ldap \
@ -390,9 +390,9 @@ exit 0
%dir %{_sysconfdir}/sasl2 %dir %{_sysconfdir}/sasl2
%dir %{_plugindir2}/ %dir %{_plugindir2}/
%{_plugindir2}/*anonymous*.so* %{_plugindir2}/*anonymous*.so*
#%{_plugindir2}/*sasldb*.so* %{_plugindir2}/*sasldb*.so*
#%{_sbindir}/saslpasswd2 %{_sbindir}/saslpasswd2
#%{_sbindir}/sasldblistusers2 %{_sbindir}/sasldblistusers2
%files plain %files plain
%defattr(-,root,root) %defattr(-,root,root)
@ -436,6 +436,9 @@ exit 0
/etc/rc.d/init.d/saslauthd /etc/rc.d/init.d/saslauthd
%changelog %changelog
* Mon Apr 16 2012 Jindrich Novy <jnovy@redhat.com> 2.1.23-32
- re-enable libdb support and utilities
* Tue Apr 04 2012 Jindrich Novy <jnovy@redhat.com> 2.1.23-31 * Tue Apr 04 2012 Jindrich Novy <jnovy@redhat.com> 2.1.23-31
- temporarily disable libdb support to resolve cyrus-sasl - temporarily disable libdb support to resolve cyrus-sasl
chicken and egg build problem against libdb chicken and egg build problem against libdb