IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge.

Browse Source
This commit is contained in:
Karl MacMillan
-
parent 86c223f472
commit cf93b1bc64
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ipa-server/freeipa-server.spec
View File

@@ -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
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~other.ELhG8g
%description
FreeIPA is a server for identity, policy, and audit.

6
ipa-server/freeipa-server.spec.in
View File

@@ -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.