packages: samba/samba.spec - disable merged_build bcond (experimental accor...

[arekm]

Author: arekm                        Date: Tue Aug 24 12:05:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable merged_build bcond (experimental according to developers)

---- Files affected:
packages/samba:
   samba.spec (1.491 -> 1.492) 

---- Diffs:

================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.491 packages/samba/samba.spec:1.492
--- packages/samba/samba.spec:1.491	Thu Aug 19 20:55:43 2010
+++ packages/samba/samba.spec	Tue Aug 24 14:04:57 2010
@@ -25,7 +25,7 @@
 %bcond_without	kerberos5	# without Kerberos V support
 %bcond_without	ldap		# without LDAP support
 %bcond_without	avahi
-%bcond_without	merged_build	# without samba3+samba4 merge
+%bcond_with	merged_build	# without samba3+samba4 merge
 %bcond_without	system_libtalloc
 								# http://wiki.samba.org/index.php/Franky
 %bcond_with	mks		# with vfs-mks (mksd dependency not distributale)
@@ -1719,6 +1719,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.492  2010/08/24 12:04:57  arekm
+- disable merged_build bcond (experimental according to developers)
+
 Revision 1.491  2010/08/19 18:55:43  arekm
 - system libtalloc is back (since it's available in tarball form now)
 
================================================================

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