summaryrefslogtreecommitdiffstats
path: root/ipa-server/freeipa-server.spec.in
diff options
context:
space:
mode:
Diffstat (limited to 'ipa-server/freeipa-server.spec.in')
-rw-r--r--ipa-server/freeipa-server.spec.in6
1 files changed, 1 insertions, 5 deletions
diff --git a/ipa-server/freeipa-server.spec.in b/ipa-server/freeipa-server.spec.in
index a75c079a..549afc97 100644
--- a/ipa-server/freeipa-server.spec.in
+++ b/ipa-server/freeipa-server.spec.in
@@ -10,13 +10,9 @@ Source0: %{name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-<<<<<<< /home/kmacmill/projects/freeipa/hg/freeipa/ipa-server/freeipa-server.spec.in
-Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python python-ldap freeipa-python ntpd
+Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python mod_auth_kerb python-ldap freeipa-python ntpd cyrus-sasl-gssapi
%define httpd_conf /etc/httpd/conf.d
-=======
-Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python mod_auth_kerb python-ldap freeipa-python cyrus-sasl-gssapi
->>>>>>> /tmp/freeipa-server.spec.in~other.0NtfVs
%description
FreeIPA is a server for identity, policy, and audit.