SPECS: samba.spec - rel 2 - s/heimdal/krb5/

[baggins]

Author: baggins                      Date: Sat Mar 31 22:14:46 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2
- s/heimdal/krb5/

---- Files affected:
SPECS:
   samba.spec (1.352 -> 1.353) 

---- Diffs:

================================================================
Index: SPECS/samba.spec
diff -u SPECS/samba.spec:1.352 SPECS/samba.spec:1.353
--- SPECS/samba.spec:1.352	Wed Feb 14 00:30:47 2007
+++ SPECS/samba.spec	Sun Apr  1 00:14:40 2007
@@ -5,12 +5,12 @@
 # Conditional build:
 %bcond_without	ads		# without ActiveDirectory support
 %bcond_without	cups		# without CUPS support
-%bcond_without	krb5		# without Kerberos5/Heimdal support
+%bcond_without	kerberos5	# without Kerberos V support
 %bcond_without	ldap		# without LDAP support
 %bcond_without	python		# without python libs/utils
 
-# ADS requires krb5 and LDAP
-%if !%{with krb5} || !%{with ldap}
+# ADS requires kerberos5 and LDAP
+%if !%{with kerberos5} || !%{with ldap}
 %undefine	with_ads
 %endif
 %define		vscan_version 0.3.6b
@@ -32,7 +32,7 @@
 Summary(zh_CN.UTF-8):	Samba 客户端和服务器
 Name:		samba
 Version:	3.0.24
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2
 Group:		Networking/Daemons
@@ -59,7 +59,7 @@
 BuildRequires:	automake
 %{?with_cups:BuildRequires:	cups-devel >= 1:1.2.0}
 BuildRequires:	dmapi-devel
-%{?with_krb5:BuildRequires:	heimdal-devel >= 0.7}
+%{?with_kerberos5:BuildRequires:	krb5-devel}
 BuildRequires:	iconv
 BuildRequires:	libnscd-devel
 BuildRequires:	libmagic-devel
@@ -297,7 +297,7 @@
 Summary(uk.UTF-8):	Клієнтські програми Samba (SMB)
 Group:		Applications/Networking
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-%{?with_krb5:Requires:	heimdal-libs >= 0.7}
+%{?with_kerberos5:Requires:	krb5-libs}
 Obsoletes:	mount-cifs
 Obsoletes:	smbfs
 
@@ -977,7 +977,7 @@
 	--with-fhs \
 	%{?with_python:--with-python} \
 	--with%{!?with_ldap:out}-ldap \
-	--with%{!?with_krb5:out}-krb5
+	--with%{!?with_kerberos5:out}-krb5
 
 %{__make} proto
 %{__make} everything pam_smbpass bin/smbget bin/mount.cifs bin/vfstest
@@ -1455,6 +1455,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.353  2007/03/31 22:14:40  baggins
+- rel 2
+- s/heimdal/krb5/
+
 Revision 1.352  2007/02/13 23:30:47  glen
 - 3.0.24
   resolves CVE-2007-0452, CVE-2007-0454
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/samba.spec?r1=1.352&r2=1.353&f=u