[389-ds-base/f13/master: 4/5] Merge branch 'master' into f13

[Richard Allen Megginson]

commit 1c7c2776885e333a9e173822c36f5d3c184332b8
Merge: a44306d a0ed453
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Oct 20 09:15:13 2010 -0600

    Merge branch 'master' into f13
    
    Conflicts:
    
    	389-ds-base.spec

 .gitignore               |    2 +-
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |   41 +++++++++++++++++++++++++++++++++++------
 sources                  |    2 +-
 5 files changed, 39 insertions(+), 10 deletions(-)
---
diff --cc 389-ds-base.spec
index daf2f93,8e2ec10..b4e81a6
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -3,11 -3,12 +3,13 @@@
  # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
  # also remove the space between % and global - this space is needed because
  # fedpkg verrel stupidly ignores comment lines
- #% global prerel .rc7
+ %global prerel .a2
  # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
- #% global relprefix 0.
+ %global relprefix 0.
  
  %global selinux_variants mls targeted
 -%global use_openldap 1
++# only F-14 and later use openldap
++# % global use_openldap 1
  
  Summary:          389 Directory Server (base)
  Name:             389-ds-base
@@@ -347,8 -365,22 +365,19 @@@ en
  %{_datadir}/%{pkgname}-selinux
  
  %changelog
- * Wed Sep 29 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6.1-2
- - bump rev to rebuild
+ * Tue Oct 19 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.7-0.2.a2
+ - 1.2.7.a2 release - a1 was the OpenLDAP testday release
+ - git tag 389-ds-base-1.2.7.a2
+ - added openldap support on platforms that use openldap with moznss
+ - for crypto (F-14 and later)
+ - many bug fixes
+ - Account Policy Plugin (keep track of last login, disable old accounts)
+ 
+ * Fri Oct  8 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.7-0.1.a1
+ - added openldap support
+ 
 -* Wed Sep 29 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6.1-3
 -- bump rel to rebuild again
 -
+ * Mon Sep 27 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6.1-2
+ - bump rel to rebuild
  
  * Thu Sep 23 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6.1-1
  - This is the 1.2.6.1 release - git tag 389-ds-base-1.2.6.1