packages: openldap/openldap.spec - added heimdal bcond - -devel requires ke...

[baggins]

Author: baggins                      Date: Wed Jun 17 12:25:56 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added heimdal bcond
- -devel requires kerberos devel

---- Files affected:
packages/openldap:
   openldap.spec (1.302 -> 1.303) 

---- Diffs:

================================================================
Index: packages/openldap/openldap.spec
diff -u packages/openldap/openldap.spec:1.302 packages/openldap/openldap.spec:1.303
--- packages/openldap/openldap.spec:1.302	Tue May 26 14:26:29 2009
+++ packages/openldap/openldap.spec	Wed Jun 17 14:25:51 2009
@@ -7,6 +7,7 @@
 #
 # Conditional build:
 %bcond_without	exchange	# hacked version of library for Evolution Exchange support
+%bcond_with	heimdal		# build with Heimdal Kerberos instead of MIT
 %bcond_without	odbc		# disable sql backend
 %bcond_with	ndb		# enable MySQL NDB Cluster backend
 %bcond_without	perl		# disable perl backend
@@ -59,6 +60,7 @@
 Patch15:	%{name}-ldapc++.patch
 Patch16:	%{name}-pie.patch
 Patch17:	%{name}-gethostbyXXXX_r.patch
+Patch18:	%{name}-smbk5pwd-heimdal.patch
 # Patch for the evolution library
 Patch100:	%{name}-ntlm.diff
 URL:		http://www.openldap.org/
@@ -71,7 +73,11 @@
 %{?with_system_db:BuildRequires:	db-devel >= 4.2}
 BuildRequires:	gcc >= 5:3.4
 BuildRequires:	groff
+%if %{with heimdal}
+BuildRequires:	heimdal-devel
+%else
 BuildRequires:	krb5-devel
+%endif
 BuildRequires:	libltdl-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:2.2
@@ -166,6 +172,11 @@
 Requires:	%{name}-libs = %{version}-%{release}
 %{?with_sasl:Requires:	cyrus-sasl-devel >= 2.1.15}
 Requires:	openssl-devel >= 0.9.7c
+%if %{with heimdal}
+Requires:	heimdal-devel
+%else
+Requires:	krb5-devel
+%endif
 
 %description devel
 Header files and libraries for developing applications that use LDAP.
@@ -869,7 +880,11 @@
 %patch10 -p1
 %patch11 -p1
 %patch13 -p1
+%if %{with heimdal}
+%patch18 -p1
+%else
 %patch14 -p1
+%endif
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
@@ -1717,6 +1732,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.303  2009/06/17 12:25:51  baggins
+- added heimdal bcond
+- -devel requires kerberos devel
+
 Revision 1.302  2009/05/26 12:26:29  baggins
 - up to 2.4.16
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap.spec?r1=1.302&r2=1.303&f=u