diff options
| author | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-08-08 16:17:09 -0400 |
|---|---|---|
| committer | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-08-08 16:17:09 -0400 |
| commit | cf93b1bc642a843242cc9aaf585c08c5475ad632 (patch) | |
| tree | 09d37b112d083c799731f342cdac4aca54113756 | |
| parent | 86c223f4727cdfd0a194afbf3442ef38a234a0e5 (diff) | |
| download | freeipa.git-cf93b1bc642a843242cc9aaf585c08c5475ad632.tar.gz freeipa.git-cf93b1bc642a843242cc9aaf585c08c5475ad632.tar.xz freeipa.git-cf93b1bc642a843242cc9aaf585c08c5475ad632.zip | |
Fixed merge.
| -rwxr-xr-x | ipa-server/freeipa-server.spec | 6 | ||||
| -rw-r--r-- | ipa-server/freeipa-server.spec.in | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/ipa-server/freeipa-server.spec b/ipa-server/freeipa-server.spec index 7de84e18..463db589 100755 --- a/ipa-server/freeipa-server.spec +++ b/ipa-server/freeipa-server.spec @@ -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. 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. |