[freeipa/f19] Update to upstream 3.2.0 Beta 1

[rcritten]

commit b181f31ce354f4efa83c15252604d7b4adeb1b56
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Tue Apr 16 12:12:57 2013 -0400

    Update to upstream 3.2.0 Beta 1

 .gitignore   |    1 +
 freeipa.spec |   30 ++++++++++++++++++++++--------
 sources      |    2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3c1fccf..8a2a37e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /freeipa-3.1.0.tar.gz
 /freeipa-3.1.2.tar.gz
 /freeipa-3.2.0.pre1.tar.gz
+/freeipa-3.2.0.beta1.tar.gz
diff --git a/freeipa.spec b/freeipa.spec
index f967640..d2f8440 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -4,11 +4,11 @@
 %global plugin_dir %{_libdir}/dirsrv/plugins
 %global POLICYCOREUTILSVER 2.1.12-5
 %global gettext_domain ipa
-%global VERSION 3.2.0.pre1
+%global VERSION 3.2.0.beta1
 
 Name:           freeipa
 Version:        3.2.0
-Release:        0.1.pre1%{?dist}
+Release:        0.2.beta1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -24,7 +24,7 @@ BuildRequires:  /usr/share/selinux/devel/Makefile
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
 BuildRequires:  systemd-units
 %if 0%{?fedora} >= 18
-BuildRequires:  samba-devel >= 4.0.0-150
+BuildRequires:  samba-devel >= 2:4.0.5-1
 BuildRequires:  samba-python
 BuildRequires:  libwbclient-devel
 %else
@@ -75,6 +75,11 @@ BuildRequires:  check
 BuildRequires:  libsss_idmap-devel
 BuildRequires:  java-1.7.0-openjdk
 
+# Find out Kerberos middle version to infer ABI changes in DAL driver
+# We cannot load DAL driver into KDC with wrong ABI.
+# This is also needed to support ipa-devel repository where krb5 1.11 is available for F18
+%global krb5_dal_version %{expand:%(echo "#include <kdb.h>"|cpp -dM|grep KRB5_KDB_DAL_MAJOR_VERSION|cut -d' ' -f3)}
+
 %description
 IPA is an integrated solution to provide centrally managed Identity (machine,
 user, virtual machines, groups, authentication credentials), Policy
@@ -93,10 +98,10 @@ Requires: 389-ds-base >= 1.3.0.5
 Requires: openldap-clients
 Requires: nss
 Requires: nss-tools
-%if 0%{?fedora} >= 19
-Requires: krb5-server >= 1.11
+%if 0%{?krb5_dal_version} >= 4
+Requires: krb5-server >= 1.11.2-1
 %else
-%if 0%{?fedora} == 18
+%if 0%{krb5_dal_version} == 3
 # krb5 1.11 bumped DAL interface major version, a rebuild is needed
 Requires: krb5-server < 1.11
 Requires: krb5-server >= 1.10
@@ -190,7 +195,7 @@ Requires: %{name}-server = %version-%release
 Requires: m2crypto
 %if 0%{?fedora} >= 18
 Requires: samba-python
-Requires: samba
+Requires: samba >= 2:4.0.5-1
 Requires: samba-winbind
 %else
 Requires: samba4-python
@@ -220,7 +225,7 @@ Requires(postun): %{name}-server = %{version}-%{release}
 
 # Specific requires
 Requires(pre): 389-ds-base = 1.3.0.5
-Requires: krb5-server = 1.11.1
+Requires: krb5-server = 1.11.2-1
 Requires: pki-ca = 10.0.1
 
 %description server-strict
@@ -465,6 +470,7 @@ install -m 644 init/systemd/ipa_memcached.service %{buildroot}%{_unitdir}/ipa_me
 mkdir -p %{buildroot}%{_libexecdir}
 install -m 755 init/systemd/freeipa-systemd-upgrade %{buildroot}%{_libexecdir}/freeipa-systemd-upgrade
 # Fedora spec file only: END
+mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup
 %endif  # ! %{ONLY_CLIENT}
 
 mkdir -p %{buildroot}%{_sysconfdir}/ipa/
@@ -620,6 +626,8 @@ fi
 %files server -f server-python.list
 %defattr(-,root,root,-)
 %doc COPYING README Contributors.txt
+%{_sbindir}/ipa-backup
+%{_sbindir}/ipa-restore
 %{_sbindir}/ipa-ca-install
 %{_sbindir}/ipa-dns-install
 %{_sbindir}/ipa-server-install
@@ -743,6 +751,7 @@ fi
 %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/backup
 %attr(700,root,root) %dir %{_localstatedir}/lib/ipa/sysrestore
 %attr(700,root,root) %dir %{_localstatedir}/lib/ipa/sysupgrade
 %attr(755,root,root) %dir %{_localstatedir}/lib/ipa/pki-ca
@@ -766,6 +775,8 @@ fi
 %{_mandir}/man8/ipactl.8.gz
 %{_mandir}/man8/ipa-upgradeconfig.8.gz
 %{_mandir}/man1/ipa-compliance.1.gz
+%{_mandir}/man1/ipa-backup.1.gz
+%{_mandir}/man1/ipa-restore.1.gz
 
 %files server-selinux
 %defattr(-,root,root,-)
@@ -849,6 +860,9 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
 
 %changelog
+* Tue Apr 16 2013 Rob Crittenden <rcritten at redhat.com> - 3.2.0-0.2.beta1
+- Update to upstream 3.2.0 Beta 1
+
 * Tue Apr  2 2013 Martin Kosek <mkosek at redhat.com> - 3.2.0-0.1.pre1
 - Update to upstream 3.2.0 Prerelease 1
 - Use upstream reference spec file as a base for Fedora spec file
diff --git a/sources b/sources
index 8b7c7b2..c0328ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb93b180518f4450118183d1c579459b  freeipa-3.2.0.pre1.tar.gz
+fb2ec5e9c744f8177cb3cd40c4063bf5  freeipa-3.2.0.beta1.tar.gz