From 9ab4e5c259e94704d6285566cde17474ceabf30d Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 04:02:15 +0000
Subject: [PATCH] auto-import changelog data from cyrus-sasl-1.5.24-17.src.rpm
 Fri Mar 02 2001 Nalin Dahyabhai <nalin@redhat.com> - rebuild in new
 environment Fri Jan 19 2001 Nalin Dahyabhai <nalin@redhat.com> - rebuild in
 new environment Wed Dec 06 2000 Nalin Dahyabhai <nalin@redhat.com> - fix
 gssapi-over-tls Fri Oct 27 2000 Nalin Dahyabhai <nalin@redhat.com> - enable
 static libraries, but always build with -fPIC

---
 cyrus-sasl.spec | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index a4bf6a7..5e4f58c 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -1,12 +1,13 @@
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
 Version: 1.5.24
-Release: 11
+Release: 17
 Copyright: distributable
 Group: System Environment/Libraries
 Source: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
 URL: http://asg.web.cmu.edu/sasl/sasl-library.html
 Patch0: cyrus-sasl-1.5.21-des.patch
+Patch1: cyrus-sasl-1.5.24-external.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: krb5-devel, openssl-devel
 Requires: pam
@@ -38,10 +39,13 @@ GSSAPI authentication.  GSSAPI is commonly used for Kerberos authentication.
 %prep
 %setup -q
 %patch0 -p1 -b .des
+%patch1 -p1 -b .external
 
 %build
 autoconf
+CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"; export CFLAGS
 %configure \
+	--enable-static --enable-shared \
 	--with-plugindir=%{_libdir}/sasl \
 	--with-dblib=gdbm \
 	--disable-krb4 \
@@ -78,8 +82,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/saslpasswd
 %{_sbindir}/sasldblistusers
 
-# %files devel
-# %defattr(-,root,root)
+%files devel
+%defattr(-,root,root)
 %{_includedir}/*.h
 %{_libdir}/libsasl*.*a
 %{_libdir}/libsasl*.*so
@@ -91,14 +95,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/sasl/*plain*.*a
 %{_mandir}/man3/*
 
-# %files gssapi
-# %defattr(-,root,root)
-# %{_libdir}/sasl/*gssapi*.so*
+%files gssapi
+%defattr(-,root,root)
+%{_libdir}/sasl/*gssapi*.so*
 
 %changelog
+* Fri Mar  2 2001 Nalin Dahyabhai <nalin@redhat.com>
+- rebuild in new environment
+
+* Fri Jan 19 2001 Nalin Dahyabhai <nalin@redhat.com>
+- rebuild in new environment
+
+* Wed Dec  6 2000 Nalin Dahyabhai <nalin@redhat.com>
+- fix gssapi-over-tls
+
+* Fri Oct 27 2000 Nalin Dahyabhai <nalin@redhat.com>
+- enable static libraries, but always build with -fPIC
+
 * Wed Oct 25 2000 Nalin Dahyabhai <nalin@redhat.com>
-- make sure the version of 1.5.24 in the package matches the master (#18968)
-- re-merge -devel and main for an errata candidate
+- make sure the version of 1.5.24 in the package matches the masters (#18968)
 
 * Mon Oct  9 2000 Nalin Dahyabhai <nalin@redhat.com>
 - re-add the libsasl.so symlink to the -devel package (oops)