[freeipa/f15] Update to upstream 2.1.3

[rcritten]

commit a6af4aac2d5a2dca5cbd374916c68ec19a11beeb
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Tue Oct 18 16:20:18 2011 -0400

    Update to upstream 2.1.3

 .gitignore   |    1 +
 freeipa.spec |   31 ++++++++++++++++++++++---------
 sources      |    2 +-
 3 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e5b7da..53bcd46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /freeipa-2.0.1.tar.gz
 /freeipa-2.1.0.tar.gz
 /freeipa-2.1.1.tar.gz
+/freeipa-2.1.3.tar.gz
diff --git a/freeipa.spec b/freeipa.spec
index 9036f2e..a32d91c 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -13,7 +13,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %global gettext_domain ipa
 
 Name:           freeipa
-Version:        2.1.1
+Version:        2.1.3
 Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
@@ -71,8 +71,8 @@ Group: System Environment/Base
 Requires: %{name}-python = %{version}-%{release}
 Requires: %{name}-client = %{version}-%{release}
 Requires: %{name}-admintools = %{version}-%{release}
-Requires(post): %{name}-server-selinux = %{version}-%{release}
-Requires(pre): 389-ds-base >= 1.2.9.7-1
+Requires: %{name}-server-selinux = %{version}-%{release}
+Requires(pre): 389-ds-base >= 1.2.10-0.4.a4
 Requires: openldap-clients
 Requires: nss
 Requires: nss-tools
@@ -92,13 +92,20 @@ Requires: python-pyasn1 >= 0.0.9a
 Requires: selinux-policy >= 3.9.16-18
 Requires(post): selinux-policy-base
 Requires: slapi-nis >= 0.21
-Requires: pki-ca >= 9.0.12
-Requires: pki-silent >= 9.0.12
+Requires: pki-ca >= 9.0.15
+Requires: pki-silent >= 9.0.15
+Requires: pki-setup >= 9.0.15
 Requires: dogtag-pki-common-theme
 Requires: dogtag-pki-ca-theme
 Requires(preun):  python initscripts chkconfig
 Requires(postun): python initscripts chkconfig
 
+# We have a soft-requires on bind. It is an optional part of
+# IPA but if it is configured we need a way to require versions
+# that work for us.
+Conflicts: bind-dyndb-ldap < 1.0.0-0.1.b1
+Conflicts: bind < 9.8.1-1
+
 Obsoletes: ipa-server >= 1.0
 
 %description server
@@ -113,7 +120,8 @@ this package).
 %package server-selinux
 Summary: SELinux rules for freeipa-server daemons
 Group: System Environment/Base
-Requires: %{name}-server = %{version}-%{release}
+Requires(post): %{name}-server = %{version}-%{release}
+Requires(postun): %{name}-server = %{version}-%{release}
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
 
 Obsoletes: ipa-server-selinux >= 1.0
@@ -264,8 +272,8 @@ ln -s ../../../..%{_sysconfdir}/ipa/html/ipa_error.css \
 # So we can own our Apache configuration
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
 /bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa.conf
-/bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
 /bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-pki-proxy.conf
+/bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
 install -m755 ipa.init %{buildroot}%{_initrddir}/ipa
 %endif
 
@@ -370,7 +378,7 @@ fi
 %{_sbindir}/ipa-ldap-updater
 %{_sbindir}/ipa-compat-manage
 %{_sbindir}/ipa-nis-manage
-%{_sbindir}/ipa-host-net-manage
+%{_sbindir}/ipa-managed-entries
 %{_sbindir}/ipa_kpasswd
 %{_sbindir}/ipactl
 %{_sbindir}/ipa-upgradeconfig
@@ -446,7 +454,7 @@ fi
 %{_mandir}/man1/ipa-ca-install.1.gz
 %{_mandir}/man1/ipa-compat-manage.1.gz
 %{_mandir}/man1/ipa-nis-manage.1.gz
-%{_mandir}/man1/ipa-host-net-manage.1.gz
+%{_mandir}/man1/ipa-managed-entries.1.gz
 %{_mandir}/man1/ipa-ldap-updater.1.gz
 %{_mandir}/man8/ipa_kpasswd.8.gz
 %{_mandir}/man8/ipactl.8.gz
@@ -494,7 +502,9 @@ fi
 %defattr(-,root,root,-)
 %doc COPYING README Contributors.txt
 %dir %{python_sitelib}/ipapython
+%dir %{python_sitelib}/ipapython/platform
 %{python_sitelib}/ipapython/*.py*
+%{python_sitelib}/ipapython/platform/*.py*
 %dir %{python_sitelib}/ipalib
 %{python_sitelib}/ipalib/*
 %{python_sitearch}/default_encoding_utf8.so
@@ -506,6 +516,9 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
 
 %changelog
+* Tue Oct 18 2011 Rob Crittenden <rcritten at redhat.com> - 2.1.3-1
+- Update to upstream 2.1.3
+
 * Wed Sep  7 2011 Rob Crittenden <rcritten at redhat.com> - 2.1.1-1
 - Update to upstream 2.1.1
 
diff --git a/sources b/sources
index c2d24df..bfd5665 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52654e666d5045c66106a5b57a4959a8  freeipa-2.1.1.tar.gz
+8475a0768b90171f58b4be76d09d6820  freeipa-2.1.3.tar.gz