[freeipa/f18] Update to upstream 3.1.3

[Martin Kosek]

commit 0f4e627acbbffd72e9d1fa485ce26503220916a7
Author: Martin Kosek <mkosek at redhat.com>
Date:   Tue Mar 26 16:03:12 2013 +0100

    Update to upstream 3.1.3

 .gitignore   |    1 +
 freeipa.spec |   27 +++++++++++++++++++++------
 sources      |    2 +-
 3 files changed, 23 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e4f8a44..7c838ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /freeipa-3.0.1.tar.gz
 /freeipa-3.1.0.tar.gz
 /freeipa-3.1.2.tar.gz
+/freeipa-3.1.3.tar.gz
diff --git a/freeipa.spec b/freeipa.spec
index ea69e0e..3a17b8a 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -11,10 +11,10 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 %global POLICYCOREUTILSVER 2.1.12-5
 %global gettext_domain ipa
-%global VERSION 3.1.2
+%global VERSION 3.1.3
 
 Name:           freeipa
-Version:        3.1.2
+Version:        3.1.3
 Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
@@ -72,6 +72,7 @@ BuildRequires:  m2crypto
 BuildRequires:  check >= 0.9.5
 BuildRequires:  libsss_idmap-devel
 BuildRequires:  checkpolicy
+BuildRequires:  java-1.7.0-openjdk
 
 %description
 IPA is an integrated solution to provide centrally managed Identity (machine,
@@ -109,7 +110,7 @@ Requires: python-memcached
 Requires: systemd-units >= 36-3
 Requires(pre): systemd-units
 Requires(post): systemd-units
-Requires: selinux-policy >= 3.11.1-61
+Requires: selinux-policy >= 3.11.1-86
 Requires(post): selinux-policy-base
 Requires: slapi-nis >= 0.44
 Requires: pki-ca >= 10.0.0-1
@@ -124,6 +125,7 @@ Requires: keyutils
 Requires: zip
 Requires: policycoreutils >= %{POLICYCOREUTILSVER}
 Requires: tar
+Requires(pre): certmonger >= 0.65
 
 # 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
@@ -191,9 +193,9 @@ Requires(post): %{name}-server = %{version}-%{release}
 Requires(postun): %{name}-server = %{version}-%{release}
 
 # Specific requires
-Requires: 389-ds-base = 1.3.0
+Requires: 389-ds-base = 1.3.0.4
 Requires: krb5-server = 1.10.3
-Requires: pki-ca = 10.0.0
+Requires: pki-ca = 10.0.1
 
 %description server-strict
 IPA is an integrated solution to provide centrally managed Identity (machine,
@@ -220,7 +222,7 @@ Requires: wget
 Requires: libcurl
 Requires: xmlrpc-c
 Requires: sssd >= 1.9.2
-Requires: certmonger >= 0.60
+Requires: certmonger >= 0.65
 Requires: nss-tools
 Requires: bind-utils
 Requires: oddjob-mkhomedir
@@ -355,6 +357,7 @@ rm %{buildroot}/%{plugin_dir}/libipa_uuid.la
 rm %{buildroot}/%{plugin_dir}/libipa_modrdn.la
 rm %{buildroot}/%{plugin_dir}/libipa_lockout.la
 rm %{buildroot}/%{plugin_dir}/libipa_cldap.la
+rm %{buildroot}/%{plugin_dir}/libipa_dns.la
 rm %{buildroot}/%{plugin_dir}/libipa_sidgen.la
 rm %{buildroot}/%{plugin_dir}/libipa_sidgen_task.la
 rm %{buildroot}/%{plugin_dir}/libipa_extdom_extop.la
@@ -449,6 +452,7 @@ if [ $1 -gt 1 ] ; then
     # Note also it is now safe to run this script against working FreeIPA install
     # after it has been migrated to systemd setup
     /usr/libexec/freeipa-systemd-upgrade || :
+    /bin/systemctl condrestart certmonger.service 2>&1 || :
     /usr/sbin/ipa-upgradeconfig --quiet >/dev/null || :
 fi
 
@@ -456,6 +460,7 @@ fi
 # This must be run in posttrans so that updates from previous
 # execution that may no longer be shipped are not applied.
 /usr/sbin/ipa-ldap-updater --upgrade >/dev/null || :
+/usr/sbin/ipa-ldap-updater --upgrade --quiet >/dev/null || :
 
 %preun server
 if [ $1 = 0 ]; then
@@ -629,6 +634,12 @@ fi
 %{_usr}/share/ipa/ui/*.woff
 %dir %{_usr}/share/ipa/ui/ext
 %config(noreplace) %{_usr}/share/ipa/ui/ext/extension.js
+%dir %{_usr}/share/ipa/ui/js/dojo
+%{_usr}/share/ipa/ui/js/dojo/dojo.js
+%dir %{_usr}/share/ipa/ui/js/libs
+%{_usr}/share/ipa/ui/js/libs/*.js
+%dir %{_usr}/share/ipa/ui/js/freeipa
+%{_usr}/share/ipa/ui/js/freeipa/app.js
 %dir %{_usr}/share/ipa/ui/images
 %{_usr}/share/ipa/ui/images/*.png
 %{_usr}/share/ipa/ui/images/*.gif
@@ -665,6 +676,7 @@ fi
 %attr(755,root,root) %{plugin_dir}/libipa_modrdn.so
 %attr(755,root,root) %{plugin_dir}/libipa_lockout.so
 %attr(755,root,root) %{plugin_dir}/libipa_cldap.so
+%attr(755,root,root) %{plugin_dir}/libipa_dns.so
 %attr(755,root,root) %{plugin_dir}/libipa_range_check.so
 %dir %{_localstatedir}/lib/ipa
 %attr(700,root,root) %dir %{_localstatedir}/lib/ipa/sysrestore
@@ -763,6 +775,9 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
 
 %changelog
+* Tue Mar 26 2013 Martin Kosek <mkosek at redhat.com> - 3.1.3-1
+- Update to upstream 3.1.3
+
 * Wed Jan 23 2013 Rob Crittenden <rcritten at redhat.com> - 3.1.2-1
 - Update to upstream 3.1.2
 - CVE-2012-4546: Incorrect CRLs publishing
diff --git a/sources b/sources
index b4cea5c..e1e48e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f265c67b12686d1e8e3a42ca0ac017f6  freeipa-3.1.2.tar.gz
+dbcc4cd3440372965d9f77162de2a7e6  freeipa-3.1.3.tar.gz