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
This commit is contained in:
Martin Kosek committed 2012-10-01 17:32:02 +02:00
1 parent 988ea36827
commit 63c7f61501
1 file changed
+17 -1
+17 -1
View File
@@ -31,8 +31,14 @@ BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
%if 0%{?fedora} >= 16 %if 0%{?fedora} >= 16
BuildRequires: systemd-units BuildRequires: systemd-units
%endif %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-devel >= 4.0.0-139
BuildRequires: samba4-python BuildRequires: samba4-python
%endif
BuildRequires: libtalloc-devel BuildRequires: libtalloc-devel
BuildRequires: libtevent-devel BuildRequires: libtevent-devel
%endif %endif
@@ -214,10 +220,16 @@ Summary: Virtual package to install packages required for Active Directory trust
Group: System Environment/Base Group: System Environment/Base
Requires: %{name}-server = %version-%release Requires: %{name}-server = %version-%release
Requires: python-crypto Requires: python-crypto
%if 0%{?fedora} >= 18
Requires: samba-python
Requires: samba
Requires: samba-winbind
%else
Requires: samba4-python Requires: samba4-python
Requires: samba4 Requires: samba4
Requires: libsss_idmap
Requires: samba4-winbind Requires: samba4-winbind
%endif
Requires: libsss_idmap
%description server-trust-ad %description server-trust-ad
Cross-realm trusts with Active Directory in IPA require working Samba 4 installation. 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 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
%changelog %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 * Tue Sep 18 2012 Petr Viktorin <pviktori@redhat.com> - 2.99.0-46
- Set certmonger minimum version to 0.60 for Dogtag 10 support. - Set certmonger minimum version to 0.60 for Dogtag 10 support.