2.1.26-2

- sasl.h: +#include<sys/types.h> for missing size_t type (#906519)
- tighten subpkg deps via %?_isa

cyrus-sasl-2.1.26-size_t.patch

@@ -0,0 +1,12 @@
+diff -up cyrus-sasl-2.1.26/include/sasl.h.size_t cyrus-sasl-2.1.26/include/sasl.h
+--- cyrus-sasl-2.1.26/include/sasl.h.size_t	2012-10-12 09:05:48.000000000 -0500
++++ cyrus-sasl-2.1.26/include/sasl.h	2013-01-31 13:21:04.007739327 -0600
+@@ -223,6 +223,8 @@ extern "C" {
+  * they must be called before all other SASL functions:
+  */
+ 
++#include <sys/types.h>
++
+ /* memory allocation functions which may optionally be replaced:
+  */
+ typedef void *sasl_malloc_t(size_t);

cyrus-sasl.spec

@@ -8,7 +8,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.26
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD with advertising
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -22,7 +22,7 @@ Source9: saslauthd.sysconfig
 Source10: make-no-dlcompatorsrp-tarball.sh
 Source11: saslauthd.tmpfiles
 URL: http://asg.web.cmu.edu/sasl/sasl-library.html
-Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
 Patch11: cyrus-sasl-2.1.25-no_rpath.patch
 Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch
 Patch23: cyrus-sasl-2.1.23-man.patch
@@ -40,6 +40,8 @@ Patch43: cyrus-sasl-2.1.26-null-crypt.patch
 Patch44: cyrus-sasl-2.1.26-release-server_creds.patch
 # AM_CONFIG_HEADER is obsolete, use AC_CONFIG_HEADERS instead
 Patch45: cyrus-sasl-2.1.26-obsolete-macro.patch
+# missing size_t declaration in sasl.h
+Patch46: cyrus-sasl-2.1.26-size_t.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -71,8 +73,8 @@ The %{name}-lib package contains shared libraries which are needed by
 applications which use the Cyrus SASL library.
 
 %package devel
-Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 Group: Development/Libraries
 Summary: Files needed for developing applications with Cyrus SASL
@@ -82,7 +84,7 @@ The %{name}-devel package contains files needed for developing and
 compiling applications which use the Cyrus SASL library.
 
 %package gssapi
-Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
 Group: System Environment/Libraries
 Summary: GSSAPI authentication support for Cyrus SASL
 
@@ -92,7 +94,7 @@ support GSSAPI authentication. GSSAPI is commonly used for Kerberos
 authentication.
 
 %package plain
-Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
 Group: System Environment/Libraries
 Summary: PLAIN and LOGIN authentication support for Cyrus SASL
 
@@ -101,7 +103,7 @@ The %{name}-plain package contains the Cyrus SASL plugins which support
 PLAIN and LOGIN authentication schemes.
 
 %package md5
-Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
 Group: System Environment/Libraries
 Summary: CRAM-MD5 and DIGEST-MD5 authentication support for Cyrus SASL
 
@@ -110,7 +112,7 @@ The %{name}-md5 package contains the Cyrus SASL plugins which support
 CRAM-MD5 and DIGEST-MD5 authentication schemes.
 
 %package ntlm
-Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
 Group: System Environment/Libraries
 Summary: NTLM authentication support for Cyrus SASL
 
@@ -120,7 +122,7 @@ the NTLM authentication scheme.
 
 # This would more appropriately be named cyrus-sasl-auxprop-sql.
 %package sql
-Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
 Group: System Environment/Libraries
 Summary: SQL auxprop support for Cyrus SASL
 
@@ -131,7 +133,7 @@ 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.
 %package ldap
-Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
 Group: System Environment/Libraries
 Summary: LDAP auxprop support for Cyrus SASL
 
@@ -141,7 +143,7 @@ a directory server, accessed using LDAP, for storing shared secrets.
 %endif
 
 %package scram
-Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
 Group: System Environment/Libraries
 Summary: SCRAM auxprop support for Cyrus SASL
 
@@ -150,7 +152,7 @@ The %{name}-scram package contains the Cyrus SASL plugin which supports
 the SCRAM authentication scheme.
 
 %package gs2
-Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
 Group: System Environment/Libraries
 Summary: GS2 support for Cyrus SASL
 
@@ -430,6 +432,10 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir}
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Thu Jan 31 2013 Rex Dieter <rdieter@fedoraproject.org> 2.1.26-2
+- sasl.h: +#include<sys/types.h> for missing size_t type (#906519)
+- tighten subpkg deps via %%?_isa
+
 * Thu Dec 20 2012 Petr Lautrbach <plautrba@redhat.com> 2.1.26-1
 - update to 2.1.26
 - fix segfaults in sasl_gss_encode (#886140)