From 2bb258d1d18d7ee093d7c5171fa6a6d4c0cab54a Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Thu, 3 Feb 2011 16:55:42 -0500
Subject: [PATCH] Set min version of 389-ds-base to 1.2.8 Set min version of
 mod_nss 1.0.8-10 Set min version of selinux-policy to 3.9.7-27 Add dogtag
 themes to Requires Update to upstream freeipa-2.0.0.pre2

---
 .gitignore   |  1 +
 freeipa.spec | 28 +++++++++++++++++++++-------
 sources      |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3ad6516..c70bb23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /freeipa-2.0.0GIT442d6ad.tar.gz
+/freeipa-2.0.0.pre2.tar.gz
diff --git a/freeipa.spec b/freeipa.spec
index 2f7b042..af2cddc 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -12,22 +12,22 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %global POLICYCOREUTILSVER 1.33.12-1
 %global gettext_domain ipa
 
-%global git_commit 442d6ad
+%global git_commit .pre2
 
 Name:           freeipa
 Version:        2.0.0
-Release:        0.2.beta.git%{git_commit}%{?dist}
+Release:        0.1.beta2%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
 License:        GPLv3+
 URL:            http://www.freeipa.org/
 # This source is temporary until the final release of FreeIPA
-Source0:        freeipa-%{version}GIT%{git_commit}.tar.gz
+Source0:        freeipa-%{version}%{git_commit}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{ONLY_CLIENT}
-BuildRequires:  389-ds-base-devel >= 1.2.7.4
+BuildRequires:  389-ds-base-devel >= 1.2.8
 BuildRequires:  svrcore-devel
 BuildRequires:  nspr-devel
 BuildRequires:  openssl-devel
@@ -72,7 +72,7 @@ Requires: %{name}-python = %{version}-%{release}
 Requires: %{name}-client = %{version}-%{release}
 Requires: %{name}-admintools = %{version}-%{release}
 Requires(post): %{name}-server-selinux = %{version}-%{release}
-Requires: 389-ds-base >= 1.2.7.4
+Requires: 389-ds-base >= 1.2.8
 Requires: openldap-clients
 Requires: nss
 Requires: nss-tools
@@ -84,7 +84,7 @@ Requires: ntp
 Requires: httpd
 Requires: mod_wsgi
 Requires: mod_auth_kerb
-Requires: mod_nss
+Requires: mod_nss >= 1.0.8-10
 Requires: python-ldap
 Requires: python-krbV
 Requires: acl
@@ -94,6 +94,8 @@ Requires(post): selinux-policy-base
 Requires: slapi-nis >= 0.21
 Requires: pki-ca >= 9.0.0
 Requires: pki-silent >= 9.0.0
+Requires: dogtag-pki-common-theme
+Requires: dogtag-pki-ca-theme
 Requires(preun):  python initscripts chkconfig
 Requires(postun): python initscripts chkconfig
 
@@ -194,7 +196,7 @@ package.
 
 
 %prep
-%setup -n freeipa-%{version}GIT%{git_commit} -q
+%setup -n freeipa-%{version}%{git_commit} -q
 
 %build
 export CFLAGS="$CFLAGS %{optflags}"
@@ -267,6 +269,8 @@ mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore
 %if ! %{ONLY_CLIENT}
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
 install -pm 644 contrib/completion/ipa.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/ipa
+mkdir -p %{buildroot}%{_sysconfdir}/cron.d
+install -pm 644 ipa-compliance.cron %{buildroot}%{_sysconfdir}/cron.d/ipa-compliance
 %endif
 
 %clean
@@ -353,6 +357,8 @@ fi
 %{_sbindir}/ipa_kpasswd
 %{_sbindir}/ipactl
 %{_sbindir}/ipa-upgradeconfig
+%{_sbindir}/ipa-compliance
+%{_sysconfdir}/cron.d/ipa-compliance
 %attr(755,root,root) %{_initrddir}/ipa
 %attr(755,root,root) %{_initrddir}/ipa_kpasswd
 %dir %{python_sitelib}/ipaserver
@@ -415,6 +421,7 @@ fi
 %{_mandir}/man1/ipa-dns-install.1.gz
 %{_mandir}/man8/ipa_kpasswd.8.gz
 %{_mandir}/man8/ipactl.8.gz
+%{_mandir}/man1/ipa-compliance.1.gz
 
 %files server-selinux
 %defattr(-,root,root,-)
@@ -477,6 +484,13 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
 
 %changelog
+* Thu Feb  3 2011 Rob Crittenden <rcritten@redhat.com> - 2.0.0-0.1.beta2
+- Set min version of 389-ds-base to 1.2.8
+- Set min version of mod_nss 1.0.8-10
+- Set min version of selinux-policy to 3.9.7-27
+- Add dogtag themes to Requires
+- Update to upstream freeipa-2.0.0.pre2
+
 * Thu Jan 27 2011 Rob Crittenden <rcritten@redhat.com> - 2.0.0-0.2.beta.git80e87e7
 - Remove unnecessary moving of v1 CA serial number file in post script
 - Add Obsoletes for server-selinxu subpackage
diff --git a/sources b/sources
index 583c837..599826e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0b991628186e25c5abc4c9700c9fbc4  freeipa-2.0.0GIT442d6ad.tar.gz
+1ee727a1ed098ffd606b4cca928190c1  freeipa-2.0.0.pre2.tar.gz