packages (AC-branch): samba/samba.spec - release 2

[glen]

Author: glen                         Date: Fri Jan 22 17:18:23 2010 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- release 2

---- Files affected:
packages/samba:
   samba.spec (1.348.2.7.2.16 -> 1.348.2.7.2.17) 

---- Diffs:

================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.348.2.7.2.16 packages/samba/samba.spec:1.348.2.7.2.17
--- packages/samba/samba.spec:1.348.2.7.2.16	Sun Oct 25 20:31:34 2009
+++ packages/samba/samba.spec	Fri Jan 22 18:18:18 2010
@@ -20,7 +20,7 @@
 %bcond_with	mks		# with vfs-mks (mksd dependency not distributale)
 
 # ADS requires kerberos5 and LDAP
-%if !%{with kerberos5} || !%{with ldap}
+%if %{without kerberos5} || %{without ldap}
 %undefine	with_ads
 %endif
 %define		vscan_version 0.3.6c-beta5
@@ -42,7 +42,7 @@
 Summary(zh_CN.UTF-8):	Samba 客户端和服务器
 Name:		samba
 Version:	3.0.37
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2
 Group:		Networking/Daemons
@@ -74,8 +74,8 @@
 %{?with_cups:BuildRequires:	cups-devel >= 1:1.2.0}
 BuildRequires:	dmapi-devel
 BuildRequires:	fam-devel
-BuildRequires:	iconv
 %{?with_kerberos5:BuildRequires:	heimdal-devel >= 0.7}
+BuildRequires:	iconv
 BuildRequires:	libmagic-devel
 BuildRequires:	libnscd-devel
 BuildRequires:	libtool >= 2:1.4d
@@ -1505,6 +1505,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.348.2.7.2.17  2010/01/22 17:18:18  glen
+- release 2
+
 Revision 1.348.2.7.2.16  2009/10/25 19:31:34  marcus
 - update to 3.0.37
 - This is a security release to address CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.348.2.7.2.16&r2=1.348.2.7.2.17&f=u