Adopt to samba4 beta6 and add samba4-winbind dependency to freeipa-server-trust-ad

This commit is contained in:
Alexander Bokovoy 2012-08-22 18:31:36 +03:00
parent 3c1392be1b
commit 5c0f47e71d
2 changed files with 49 additions and 2 deletions

View File

@ -0,0 +1,41 @@
From cd711dd5319c0be37aa542d5fbfb0da3482267c0 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Wed, 22 Aug 2012 15:10:31 +0200
Subject: [PATCH] Use libsamba-security instead of libsecurity
In samba4-beta6 the name of a library was changed from libsecurity to
libsamba-security.
---
daemons/ipa-sam/Makefile.am | 2 +-
freeipa.spec.in | 2 +-
2 Dateien geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
diff --git a/daemons/ipa-sam/Makefile.am b/daemons/ipa-sam/Makefile.am
index 275cce629385b1719544a7832a00e9ee6664b739..ad7e516f0c94f82cc209ee55ff0b67c6a6bd54f9 100644
--- a/daemons/ipa-sam/Makefile.am
+++ b/daemons/ipa-sam/Makefile.am
@@ -3,7 +3,7 @@ SAMBA40EXTRA_LIBS = $(SAMBA40EXTRA_LIBPATH) \
-lsmbldap \
-lcliauth \
-lpdb \
- -lsecurity \
+ -lsamba-security \
-lsmbconf \
$(NULL)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index f582f22488a195fd29a1900d6df156d8b56a259f..9e25d5ace0de7bf21e39ce534abd97d5a60d94b4 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -31,7 +31,7 @@ BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
%if 0%{?fedora} >= 16
BuildRequires: systemd-units
%endif
-BuildRequires: samba4-devel >= 4.0.0-128
+BuildRequires: samba4-devel >= 4.0.0-134
BuildRequires: samba4-python
BuildRequires: libtalloc-devel
BuildRequires: libtevent-devel
--
1.7.11.4

View File

@ -15,13 +15,14 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: freeipa
Version: 3.0.0
Release: 0.4%{?dist}
Release: 0.5%{?dist}
Summary: The Identity, Policy and Audit system
Group: System Environment/Base
License: GPLv3+
URL: http://www.freeipa.org/
Source0: http://www.freeipa.org/downloads/src/freeipa-%{VERSION}.tar.gz
Patch0: freeipa-sbose-0041-2-Use-libsamba-security-instead-of-libsecurity.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{ONLY_CLIENT}
@ -30,7 +31,7 @@ BuildRequires: svrcore-devel
BuildRequires: /usr/share/selinux/devel/Makefile
BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
BuildRequires: systemd-units
BuildRequires: samba4-devel >= 4.0.0-128
BuildRequires: samba4-devel >= 4.0.0-134
BuildRequires: samba4-python
BuildRequires: libtalloc-devel
BuildRequires: libtevent-devel
@ -168,6 +169,7 @@ Requires: python-crypto
Requires: samba4-python
Requires: samba4
Requires: libsss_idmap
Requires: samba4-winbind
%description server-trust-ad
Cross-realm trusts with Active Directory in IPA require working Samba 4 installation.
@ -661,6 +663,10 @@ fi
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
%changelog
* Wed Aug 22 2012 Alexander Bokovoy <abokovoy@redhat.com> - 3.0.0-0.5
- Adopt to samba4 beta6 (libsecurity -> libsamba-security)
- Add dependency to samba4-winbind
* Fri Aug 17 2012 Rob Crittenden <rcritten@redhat.com> - 3.0.0-0.4
- Updated to upstream 3.0.0 beta 2