Clean up the spec file, add Requires for nss-pam-ldapd for F14+

Also do the following:
- Remove conflicts on mod_ssl
- Remove a lot of version checking for EOL'd Fedora versions
- Add a few conditionals for rhel6
- Add Requires of nss-tools on ipa-client

1 files changed, 17 insertions, 14 deletions

diff --git a/ipa.spec.in b/ipa.spec.in
index 3c93aeab1..fec2462c4 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -67,8 +67,7 @@ Requires: 389-ds-base >= 1.2.6
 Requires: openldap-clients
 Requires: nss
 Requires: nss-tools
-%{?fc8:Requires: krb5-server >= 1.6.2-11}
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 Requires: krb5-server
 %endif
 Requires: krb5-server-ldap
@@ -78,10 +77,7 @@ Requires: httpd
 Requires: mod_python
 Requires: mod_wsgi
 Requires: mod_auth_kerb
-%{?fc8:Requires: mod_nss >= 1.0.7-2}
-%{?fc9:Requires: mod_nss >= 1.0.7-5}
-%{?fc10:Requires: mod_nss >= 1.0.7-4}
-%if 0%{?fedora} >= 10
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 Requires: mod_nss
 %endif
 Requires: python-ldap
@@ -89,17 +85,13 @@ Requires: python-krbV
 Requires: acl
 Requires: python-pyasn1 >= 0.0.9a
 Requires: libcap
-%{?fc8:Requires: selinux-policy >= 3.0.8-117}
-%{?fc9:Requires: selinux-policy >= 3.3.1-99}
-%{?fc10:Requires: selinux-policy >= 3.5.13-11}
-%if 0%{?fedora} >= 10
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 Requires: selinux-policy
 %endif
 Requires(post): selinux-policy-base
 Requires: slapi-nis >= 0.15
 Requires: pki-ca >= 1.3.6
 Requires: pki-silent >= 1.3.4
-Conflicts: mod_ssl
 
 %description server
 IPA is an integrated solution to provide centrally managed Identity (machine,
@@ -136,12 +128,17 @@ Requires: krb5-workstation
 Requires: krb5-libs
 Requires: authconfig
 Requires: pam_krb5
+%if 0%{?fedora} >= 14 || 0%{?rhel} >= 6
+Requires: nss-pam-ldapd
+%else
 Requires: nss_ldap
+%endif
 Requires: wget
 Requires: xmlrpc-c
 Requires: libcurl
 Requires: sssd >= 1.2.1
 Requires: certmonger >= 0.26
+Requires: nss-tools
 
 %description client
 IPA is an integrated solution to provide centrally managed Identity (machine,
@@ -171,8 +168,7 @@ IPA administrators.
 %package python
 Summary: Python libraries used by IPA
 Group: System Environment/Libraries
-%{?fc8:Requires: python-kerberos >= 1.0}
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 Requires: python-kerberos >= 1.1-3
 %endif
 Requires: authconfig
@@ -476,7 +472,7 @@ fi
 %dir %{python_sitelib}/ipapython
 %{python_sitelib}/ipapython/*.py*
 %{python_sitelib}/ipalib/*
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %{python_sitelib}/ipapython-*.egg-info
 %{python_sitelib}/freeipa-*.egg-info
 %endif
@@ -502,6 +498,13 @@ fi
 %endif
 
 %changelog
+* Wed Sep  8 2010 Rob Crittenden <rcritten@redhat.com> - 1.99-28
+- Drop conflicts on mod_nss
+- Require nss-pam-ldapd on F-14 or higher instead of nss_ldap (#606847)
+- Drop a slew of conditionals on older Fedora releases (< 12)
+- Add a few conditionals against RHEL 6
+- Add Requires of nss-tools on ipa-client
+
 * Fri Aug 13 2010 Rob Crittenden <rcritten@redhat.com> - 1.99-27
 - Set minimum version of certmonger to 0.26 (to pck up #621670)
 - Set minimum version of pki-silent to 1.3.4 (adds -key_algorithm)