packages: openldap/openldap.spec - reversed heimdal bcond into krb5 bcond

[baggins]

Author: baggins                      Date: Thu Jul  2 12:32:11 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reversed heimdal bcond into krb5 bcond

---- Files affected:
packages/openldap:
   openldap.spec (1.305 -> 1.306) 

---- Diffs:

================================================================
Index: packages/openldap/openldap.spec
diff -u packages/openldap/openldap.spec:1.305 packages/openldap/openldap.spec:1.306
--- packages/openldap/openldap.spec:1.305	Mon Jun 22 15:49:47 2009
+++ packages/openldap/openldap.spec	Thu Jul  2 14:32:06 2009
@@ -7,7 +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_with	krb5		# build with MIT Kerberos instead of Heimdal
 %bcond_without	odbc		# disable sql backend
 %bcond_with	ndb		# enable MySQL NDB Cluster backend
 %bcond_without	perl		# disable perl backend
@@ -31,7 +31,7 @@
 Summary(uk.UTF-8):	Зразки клієнтів LDAP
 Name:		openldap
 Version:	2.4.16
-Release:	2
+Release:	3
 License:	OpenLDAP Public License
 Group:		Networking/Daemons
 Source0:	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
@@ -74,10 +74,10 @@
 %{?with_system_db:BuildRequires:	db-devel >= 4.2}
 BuildRequires:	gcc >= 5:3.4
 BuildRequires:	groff
-%if %{with heimdal}
-BuildRequires:	heimdal-devel
-%else
+%if %{with krb5}
 BuildRequires:	krb5-devel
+%else
+BuildRequires:	heimdal-devel
 %endif
 BuildRequires:	libltdl-devel
 BuildRequires:	libstdc++-devel
@@ -173,10 +173,10 @@
 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
+%if %{with krb5}
 Requires:	krb5-devel
+%else
+Requires:	heimdal-devel
 %endif
 
 %description devel
@@ -881,10 +881,10 @@
 %patch10 -p1
 %patch11 -p1
 %patch13 -p1
-%if %{with heimdal}
-%patch18 -p1
-%else
+%if %{with krb5}
 %patch14 -p1
+%else
+%patch18 -p1
 %endif
 %patch15 -p1
 %patch16 -p1
@@ -1734,6 +1734,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.306  2009/07/02 12:32:06  baggins
+- reversed heimdal bcond into krb5 bcond
+
 Revision 1.305  2009/06/22 13:49:47  baggins
 - rel 2
 - update shadowLastChange on password change via smbk5pwd
================================================================

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