From f2186254fdf7d92abfc2904fb4e4842142213bdd Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Thu, 24 Mar 2011 17:57:00 -0400
Subject: [PATCH] - Update to upstream GA release - Automatically apply updates
 when the package is upgraded

---
 .gitignore                      |  1 +
 freeipa-rcrit-743-dsgroup.patch | 60 ---------------------------------
 freeipa.spec                    | 20 ++++++-----
 sources                         |  2 +-
 4 files changed, 13 insertions(+), 70 deletions(-)
 delete mode 100644 freeipa-rcrit-743-dsgroup.patch

diff --git a/.gitignore b/.gitignore
index 64c89c9..2887c16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /freeipa-2.0.0.pre2.tar.gz
 /freeipa-2.0.0.rc1.tar.gz
 /freeipa-2.0.0.rc2.tar.gz
+/freeipa-2.0.0.tar.gz
diff --git a/freeipa-rcrit-743-dsgroup.patch b/freeipa-rcrit-743-dsgroup.patch
deleted file mode 100644
index ea83942..0000000
--- a/freeipa-rcrit-743-dsgroup.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 8b8c7367ce965aeaa3f3051cb1da16ad9ee7310f Mon Sep 17 00:00:00 2001
-From: Rob Crittenden <rcritten@redhat.com>
-Date: Thu, 24 Feb 2011 14:45:46 -0500
-Subject: [PATCH] Set SuiteSpotGroup when setting up our 389-ds instances.
-
-The group is now required because 389-ds has tightened the permissions
-on /var/run/dirsrv. We use the same group for both our LDAP instances
-and /var/run/dirsrv ends up as root:dirsrv mode 0770.
-
-ticket 1010
----
- ipaserver/install/cainstance.py |    4 +++-
- ipaserver/install/dsinstance.py |    2 ++
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
-index 7cdd28d..74d78dc 100644
---- a/ipaserver/install/cainstance.py
-+++ b/ipaserver/install/cainstance.py
-@@ -72,6 +72,7 @@ INF_TEMPLATE = """
- [General]
- FullMachineName=   $FQHN
- SuiteSpotUserID=   $USER
-+SuiteSpotGroup=    $GROUP
- ServerRoot=    $SERVER_ROOT
- [slapd]
- ServerPort=   $DSPORT
-@@ -255,7 +256,8 @@ class CADSInstance(service.Service):
-                              PASSWORD=self.dm_password, SUFFIX=self.suffix.lower(),
-                              REALM=self.realm_name, USER=PKI_DS_USER,
-                              SERVER_ROOT=server_root, DOMAIN=self.domain,
--                             TIME=int(time.time()), DSPORT=self.ds_port)
-+                             TIME=int(time.time()), DSPORT=self.ds_port,
-+                             GROUP=dsinstance.DS_GROUP)
- 
-     def __create_ds_user(self):
-         user_exists = True
-diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
-index bf631a6..2bb083f 100644
---- a/ipaserver/install/dsinstance.py
-+++ b/ipaserver/install/dsinstance.py
-@@ -149,6 +149,7 @@ INF_TEMPLATE = """
- [General]
- FullMachineName=   $FQHN
- SuiteSpotUserID=   $USER
-+SuiteSpotGroup=    $GROUP
- ServerRoot=    $SERVER_ROOT
- [slapd]
- ServerPort=   389
-@@ -319,6 +320,7 @@ class DsInstance(service.Service):
-                              TIME=int(time.time()), IDSTART=self.idstart,
-                              IDMAX=self.idmax, HOST=self.fqdn,
-                              ESCAPED_SUFFIX= escape_dn_chars(self.suffix.lower()),
-+                             GROUP=DS_GROUP,
-                          )
- 
-     def __create_ds_user(self):
--- 
-1.7.3.4
-
diff --git a/freeipa.spec b/freeipa.spec
index dc1d982..a88e629 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -12,20 +12,16 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %global POLICYCOREUTILSVER 1.33.12-1
 %global gettext_domain ipa
 
-%global git_commit .rc2
-
 Name:           freeipa
 Version:        2.0.0
-Release:        0.4.rc2%{?dist}
+Release:        1%{?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_commit}.tar.gz
+Source0:        http://www.freeipa.org/downloads/src/freeipa-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:         freeipa-rcrit-743-dsgroup.patch
 
 %if ! %{ONLY_CLIENT}
 BuildRequires:  389-ds-base-devel >= 1.2.8
@@ -197,8 +193,7 @@ package.
 
 
 %prep
-%setup -n freeipa-%{version}%{git_commit} -q
-%patch1 -p1
+%setup -n freeipa-%{version} -q
 
 %build
 export CFLAGS="$CFLAGS %{optflags}"
@@ -284,7 +279,10 @@ if [ $1 = 1 ]; then
     /sbin/chkconfig --add ipa
     /sbin/chkconfig --add ipa_kpasswd
 fi
-/usr/sbin/ipa-upgradeconfig || :
+if [ $1 -gt 1 ] ; then
+    /usr/sbin/ipa-upgradeconfig || :
+    /usr/sbin/ipa-ldap-updater --upgrade >/dev/null 2>&1 || :
+fi
 
 %preun server
 if [ $1 = 0 ]; then
@@ -487,6 +485,10 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
 
 %changelog
+* Thu Mar 24 2011 Rob Crittenden <rcritten@redhat.com> - 2.0.0-1
+- Update to upstream GA release
+- Automatically apply updates when the package is upgraded
+
 * Fri Feb 25 2011 Rob Crittenden <rcritten@redhat.com> - 2.0.0-0.4.rc2
 - Update to upstream freeipa-2.0.0.rc2
 - Set minimum version of python-nss to 0.11 to make sure IPv6 support is in
diff --git a/sources b/sources
index 2527491..402e1e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb9427212d5de4fa957343491e770ce5  freeipa-2.0.0.rc2.tar.gz
+188ef1c02fc7d65816b02d9f1d9b77fb  freeipa-2.0.0.tar.gz