[freeipa] - Update to upstream GA release - Automatically apply updates when the package is upgraded

rcritten rcritten at fedoraproject.org
Thu Mar 24 21:57:23 UTC 2011


commit f2186254fdf7d92abfc2904fb4e4842142213bdd
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Thu Mar 24 17:57:00 2011 -0400

    - 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(-)
---
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.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 at 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 at 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


More information about the scm-commits mailing list