[389-ds-base/el4/master: 7/9] Merge branch 'el5' into el4

[Richard Allen Megginson]

commit d99dfd4424d999b8170f66c6ade678717b8cf368
Merge: 543e4bf 9ac1a45
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Oct 20 09:32:39 2010 -0600

    Merge branch 'el5' into el4
    
    Conflicts:
    
    	389-ds-base.spec
    	sources

 .gitignore               |    2 +-
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |   37 +++++++++++++++++++++++++++++++++----
 sources                  |    2 +-
 5 files changed, 37 insertions(+), 8 deletions(-)
---
diff --cc 389-ds-base.spec
index c97b7cc,1d4eb0d..02bc009
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -3,9 -3,13 +3,11 @@@
  # 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 strict targeted
+ # only F-14 and later use openldap for now
+ # % global use_openldap 1
  
  Summary:          389 Directory Server (base)
  Name:             389-ds-base
@@@ -253,8 -361,23 +271,19 @@@ f
  %{_includedir}/%{pkgname}
  %{_libdir}/%{pkgname}/*.so
  
 -%files selinux-devel
 -%defattr(-,root,root,-)
 -%{_datadir}/%{pkgname}-selinux
 -
  %changelog
+ * 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
+ 
 -* Thu Sep 29 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6.1-2
 +* Wed Sep 29 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6.1-2
  - bump rev to rebuild
  
  * Thu Sep 23 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6.1-1