diff options
| author | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-08-08 15:27:31 -0400 |
|---|---|---|
| committer | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-08-08 15:27:31 -0400 |
| commit | 86c223f4727cdfd0a194afbf3442ef38a234a0e5 (patch) | |
| tree | 7c708b9cdedf544d1c9d70c323665a3fdbe49b13 | |
| parent | b9b06a2a607ddc7a98ac78b46e63304b714f3cce (diff) | |
| parent | 548698a8870b020709d8569b6dfbcf10e1f7e931 (diff) | |
Merge.
| -rwxr-xr-x | ipa-server/freeipa-server.spec | 6 | ||||
| -rw-r--r-- | ipa-server/freeipa-server.spec.in | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/ipa-server/freeipa-server.spec b/ipa-server/freeipa-server.spec index 54a7ac203..7de84e185 100755 --- a/ipa-server/freeipa-server.spec +++ b/ipa-server/freeipa-server.spec @@ -10,7 +10,13 @@ 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 + +%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 de6ff4eee..a75c079a4 100644 --- a/ipa-server/freeipa-server.spec.in +++ b/ipa-server/freeipa-server.spec.in @@ -10,7 +10,13 @@ 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 + +%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. |