[samba4] Fix Requires and Conflicts.

[asn]

commit 90352f8369f28ed155029026e4cdd251bf4187e1
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Wed Sep 26 09:21:28 2012 +0200

    Fix Requires and Conflicts.

 samba4.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index 47cd8d4..9078c39 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -121,7 +121,7 @@ Requires: logrotate
 Requires: pam
 Requires: perl(Parse::Yapp)
 
-Conflicts: samba < %{samba_depver}
+Conflicts: samba < %{samba_conflict_ver}
 Provides: samba = %{samba_depver}
 
 BuildRequires: autoconf
@@ -233,6 +233,7 @@ Summary: Developer tools for Samba libraries
 Group: Development/Libraries
 Requires: %{name}-common = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
+Requires: %{name}-test = %{samba_depver}
 
 Conflicts: samba-devel < %{samba_conflict_ver}
 Provides: samba-devel = %{samba_depver}
@@ -273,6 +274,7 @@ Requires: %{name} = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
 Requires: %{name}-dc = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
+Requires: %{name}-winbind = %{samba_depver}
 
 %description test
 samba4-test provides testing tools for both the server and client
@@ -297,9 +299,11 @@ Summary: Samba winbind krb5 locator
 Group: Applications/System
 %if %with_libwbclient
 Requires: libwbclient
+%else
+Requires: %{name}-libs = %{samba_depver}
 %endif
 
-Conflicts: samba-winbind-krb5-locator < %{samba_depver}
+Conflicts: samba-winbind-krb5-locator < %{samba_conflict_ver}
 Provides: samba-winbind-krb5-locator = %{samba_depver}
 
 %description winbind-krb5-locator
@@ -315,7 +319,7 @@ Requires: %{name}-libs = %{samba_depver}
 Requires: libwbclient
 %endif
 
-Conflicts: samba-winbind-clients < %{samba_depver}
+Conflicts: samba-winbind-clients < %{samba_conflict_ver}
 
 %description winbind-clients
 The samba-winbind-clients package provides the NSS library and a PAM