auto-import cyrus-sasl-2.1.10-4 from cyrus-sasl-2.1.10-4.src.rpm

cyrus-sasl.spec

@@ -5,7 +5,7 @@
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
 Version: 2.1.10
-Release: 1
+Release: 4
 License: Freely Distributable
 Group: System Environment/Libraries
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
@@ -17,10 +17,12 @@ Source5: README.RPM
 URL: http://asg.web.cmu.edu/sasl/sasl-library.html
 Patch0: cyrus-sasl-1.5.24-rpath.patch
 Patch1: cyrus-sasl-2.1.7-gdbm.patch
+Patch2: cyrus-sasl-2.1.10-des.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: autoconf213, automake15, libtool
 # Note: berkeley db for sasl2, gdbm for sasl1.
 BuildPrereq: db4-devel, gdbm-devel, krb5-devel, openssl-devel, pam-devel
+BuildPrereq: pkgconfig
 Prereq: /sbin/ldconfig, chkconfig, /sbin/service
 
 %description
@@ -78,6 +80,7 @@ popd
 
 pushd cyrus-sasl-%{version}
 %patch1 -p1 -b .gdbm
+%patch2 -p1 -b .des
 libtoolize -f
 aclocal-1.5 -I ./config -I ./cmulocal
 automake-1.5 -a --include-deps
@@ -108,7 +111,9 @@ done
 popd
 
 %build
-LDFLAGS="-L%{_prefix}/kerberos/%{_lib}"; export LDFLAGS
+CPPFLAGS="-I%{_prefix}/kerberos/include $CPPFLAGS"; export CPPFLAGS
+CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"; export CFLAGS
+LDFLAGS="-L%{_prefix}/kerberos/%{_lib} $LDFLAGS"; export LDFLAGS
 
 pushd cyrus-sasl-%{cs1_version}
 %configure \
@@ -281,6 +286,20 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Tue Jan  7 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.10-3
+- rebuild
+
+* Thu Dec 12 2002 Nalin Dahyabhai <nalin@redhat.com>
+- consider either des_cbc_encrypt or DES_cbc_encrypt to be sufficient when
+  searching for a DES implementation in libcrypto
+- pull in CPPFLAGS and LDFLAGS from openssl's pkg-config data, if it exists
+
+* Mon Dec  9 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.10-2
+- rebuild
+
 * Mon Dec  9 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.10-1
 - update to 2.1.10, fixing buffer overflows in libsasl2 noted by Timo Sirainen