summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2012-10-01 15:32:36 +0200
committerMartin Kosek <mkosek@redhat.com>2012-10-01 17:32:02 +0200
commit63c7f61501c4b9392f4286e69d43acd620eeb09f (patch)
tree95c38745c7ee635859834b3c73b61a3c2218f6f6
parent988ea368272822f2153563ad34554240e3377d60 (diff)
downloadfreeipa-63c7f61501c4b9392f4286e69d43acd620eeb09f.tar.gz
freeipa-63c7f61501c4b9392f4286e69d43acd620eeb09f.tar.xz
freeipa-63c7f61501c4b9392f4286e69d43acd620eeb09f.zip
Add support for unified samba packages
Fedora 18 and later has moved unified samba and samba4 packages. Update Requires and BuildRequires in spec file to require correct versions. Also require libwbclient-devel which now provides libwbclient.h instead of samba4-devel package. https://fedorahosted.org/freeipa/ticket/3118
-rw-r--r--freeipa.spec.in18
1 files changed, 17 insertions, 1 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in
index ef9678ec2..c86c08acc 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -31,8 +31,14 @@ BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
%if 0%{?fedora} >= 16
BuildRequires: systemd-units
%endif
+%if 0%{?fedora} >= 18
+BuildRequires: samba-devel >= 4.0.0-150
+BuildRequires: samba-python
+BuildRequires: libwbclient-devel
+%else
BuildRequires: samba4-devel >= 4.0.0-139
BuildRequires: samba4-python
+%endif
BuildRequires: libtalloc-devel
BuildRequires: libtevent-devel
%endif
@@ -214,10 +220,16 @@ Summary: Virtual package to install packages required for Active Directory trust
Group: System Environment/Base
Requires: %{name}-server = %version-%release
Requires: python-crypto
+%if 0%{?fedora} >= 18
+Requires: samba-python
+Requires: samba
+Requires: samba-winbind
+%else
Requires: samba4-python
Requires: samba4
-Requires: libsss_idmap
Requires: samba4-winbind
+%endif
+Requires: libsss_idmap
%description server-trust-ad
Cross-realm trusts with Active Directory in IPA require working Samba 4 installation.
@@ -748,6 +760,10 @@ fi
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
%changelog
+* Mon Oct 1 2012 Martin Kosek <mkosek@redhat.com> - 2.99.0-47
+- Require samba packages instead of samba4 packages obsoleted in Fedora 18 and later
+- Add libwbclient-devel BuildRequires to pick up libwbclient.h on Fedora 18 and later
+
* Tue Sep 18 2012 Petr Viktorin <pviktori@redhat.com> - 2.99.0-46
- Set certmonger minimum version to 0.60 for Dogtag 10 support.