[cyrus-sasl] re-enable libdb support and utilities

Jindrich Novy jnovy at fedoraproject.org
Mon Apr 16 14:40:03 UTC 2012


commit cf05d06586ddf246182f1352ec7eaf0e5130f3c3
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Mon Apr 16 16:41:15 2012 +0200

    re-enable libdb support and utilities

 cyrus-sasl.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 16f6dd3..4ffa1a0 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -8,7 +8,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: BSD with advertising
 Group: System Environment/Libraries
 # 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: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
 BuildRequires: mysql-devel, postgresql-devel, zlib-devel
-#BuildRequires: libdb-devel
+BuildRequires: libdb-devel
 %if ! %{bootstrap_cyrus_sasl}
 BuildRequires: openldap-devel
 %endif
@@ -259,7 +259,7 @@ echo "$LDFLAGS"
         --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
         --with-gss_impl=mit \
         --with-rc4 \
-        --with-dblib=no \
+        --with-dblib=berkeley \
         --with-saslauthd=/run/saslauthd --without-pwcheck \
 %if ! %{bootstrap_cyrus_sasl}
         --with-ldap \
@@ -390,9 +390,9 @@ exit 0
 %dir %{_sysconfdir}/sasl2
 %dir %{_plugindir2}/
 %{_plugindir2}/*anonymous*.so*
-#%{_plugindir2}/*sasldb*.so*
-#%{_sbindir}/saslpasswd2
-#%{_sbindir}/sasldblistusers2
+%{_plugindir2}/*sasldb*.so*
+%{_sbindir}/saslpasswd2
+%{_sbindir}/sasldblistusers2
 
 %files plain
 %defattr(-,root,root)
@@ -436,6 +436,9 @@ exit 0
 /etc/rc.d/init.d/saslauthd
 
 %changelog
+* Mon Apr 16 2012 Jindrich Novy <jnovy at redhat.com> 2.1.23-32
+- re-enable libdb support and utilities
+
 * Tue Apr 04 2012 Jindrich Novy <jnovy at redhat.com> 2.1.23-31
 - temporarily disable libdb support to resolve cyrus-sasl
   chicken and egg build problem against libdb


More information about the scm-commits mailing list