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
This commit is contained in:
Rob Crittenden 2010-09-09 18:10:14 -04:00
parent 86c4970d11
commit a091be064d

View File

@ -67,8 +67,7 @@ Requires: 389-ds-base >= 1.2.6
Requires: openldap-clients Requires: openldap-clients
Requires: nss Requires: nss
Requires: nss-tools Requires: nss-tools
%{?fc8:Requires: krb5-server >= 1.6.2-11} %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
%if 0%{?fedora} >= 9
Requires: krb5-server Requires: krb5-server
%endif %endif
Requires: krb5-server-ldap Requires: krb5-server-ldap
@ -78,10 +77,7 @@ Requires: httpd
Requires: mod_python Requires: mod_python
Requires: mod_wsgi Requires: mod_wsgi
Requires: mod_auth_kerb Requires: mod_auth_kerb
%{?fc8:Requires: mod_nss >= 1.0.7-2} %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
%{?fc9:Requires: mod_nss >= 1.0.7-5}
%{?fc10:Requires: mod_nss >= 1.0.7-4}
%if 0%{?fedora} >= 10
Requires: mod_nss Requires: mod_nss
%endif %endif
Requires: python-ldap Requires: python-ldap
@ -89,17 +85,13 @@ Requires: python-krbV
Requires: acl Requires: acl
Requires: python-pyasn1 >= 0.0.9a Requires: python-pyasn1 >= 0.0.9a
Requires: libcap Requires: libcap
%{?fc8:Requires: selinux-policy >= 3.0.8-117} %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
%{?fc9:Requires: selinux-policy >= 3.3.1-99}
%{?fc10:Requires: selinux-policy >= 3.5.13-11}
%if 0%{?fedora} >= 10
Requires: selinux-policy Requires: selinux-policy
%endif %endif
Requires(post): selinux-policy-base Requires(post): selinux-policy-base
Requires: slapi-nis >= 0.15 Requires: slapi-nis >= 0.15
Requires: pki-ca >= 1.3.6 Requires: pki-ca >= 1.3.6
Requires: pki-silent >= 1.3.4 Requires: pki-silent >= 1.3.4
Conflicts: mod_ssl
%description server %description server
IPA is an integrated solution to provide centrally managed Identity (machine, IPA is an integrated solution to provide centrally managed Identity (machine,
@ -136,12 +128,17 @@ Requires: krb5-workstation
Requires: krb5-libs Requires: krb5-libs
Requires: authconfig Requires: authconfig
Requires: pam_krb5 Requires: pam_krb5
%if 0%{?fedora} >= 14 || 0%{?rhel} >= 6
Requires: nss-pam-ldapd
%else
Requires: nss_ldap Requires: nss_ldap
%endif
Requires: wget Requires: wget
Requires: xmlrpc-c Requires: xmlrpc-c
Requires: libcurl Requires: libcurl
Requires: sssd >= 1.2.1 Requires: sssd >= 1.2.1
Requires: certmonger >= 0.26 Requires: certmonger >= 0.26
Requires: nss-tools
%description client %description client
IPA is an integrated solution to provide centrally managed Identity (machine, IPA is an integrated solution to provide centrally managed Identity (machine,
@ -171,8 +168,7 @@ IPA administrators.
%package python %package python
Summary: Python libraries used by IPA Summary: Python libraries used by IPA
Group: System Environment/Libraries Group: System Environment/Libraries
%{?fc8:Requires: python-kerberos >= 1.0} %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
%if 0%{?fedora} >= 9
Requires: python-kerberos >= 1.1-3 Requires: python-kerberos >= 1.1-3
%endif %endif
Requires: authconfig Requires: authconfig
@ -476,7 +472,7 @@ fi
%dir %{python_sitelib}/ipapython %dir %{python_sitelib}/ipapython
%{python_sitelib}/ipapython/*.py* %{python_sitelib}/ipapython/*.py*
%{python_sitelib}/ipalib/* %{python_sitelib}/ipalib/*
%if 0%{?fedora} >= 9 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
%{python_sitelib}/ipapython-*.egg-info %{python_sitelib}/ipapython-*.egg-info
%{python_sitelib}/freeipa-*.egg-info %{python_sitelib}/freeipa-*.egg-info
%endif %endif
@ -502,6 +498,13 @@ fi
%endif %endif
%changelog %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 * 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 certmonger to 0.26 (to pck up #621670)
- Set minimum version of pki-silent to 1.3.4 (adds -key_algorithm) - Set minimum version of pki-silent to 1.3.4 (adds -key_algorithm)