[freeipa/f18] Require samba packages instead of obsoleted samba4 packages

[Martin Kosek]

commit bc28aa54698b091e79390752736bc9c711d44cf3
Author: Martin Kosek <mkosek at redhat.com>
Date:   Tue Oct 2 08:44:41 2012 +0200

    Require samba packages instead of obsoleted samba4 packages

 freeipa.spec |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/freeipa.spec b/freeipa.spec
index 5fc6616..2f2db85 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -15,7 +15,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:           freeipa
 Version:        3.0.0
-Release:        0.6%{?dist}
+Release:        0.7%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -30,8 +30,9 @@ BuildRequires:  svrcore-devel
 BuildRequires:  /usr/share/selinux/devel/Makefile
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
 BuildRequires:  systemd-units
-BuildRequires:  samba4-devel >= 4.0.0-139
-BuildRequires:  samba4-python
+BuildRequires:  samba-devel >= 4.0.0-150
+BuildRequires:  samba-python
+BuildRequires:  libwbclient-devel
 BuildRequires:  libtalloc-devel
 BuildRequires:  libtevent-devel
 %endif
@@ -167,10 +168,10 @@ Summary: Virtual package to install packages required for Active Directory trust
 Group: System Environment/Base
 Requires: %{name}-server = %version-%release
 Requires: python-crypto
-Requires: samba4-python
-Requires: samba4
+Requires: samba-python
+Requires: samba
+Requires: samba-winbind
 Requires: libsss_idmap
-Requires: samba4-winbind
 
 %description server-trust-ad
 Cross-realm trusts with Active Directory in IPA require working Samba 4 installation.
@@ -663,6 +664,9 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
 
 %changelog
+* Tue Oct  2 2012 Martin Kosek <mkosek at redhat.com> - 3.0.0-0.7
+- Require samba packages instead of obsoleted samba4 packages
+
 * Fri Sep 21 2012 Rob Crittenden <rcritten at redhat.com> - 3.0.0-0.6
 - Updated to upstream 3.0.0 rc 1
 - Update BR for 389-ds-base to 1.2.11.14