[389-admin/el5/master: 2/2] Merge branch 'master' into el5

[Richard Allen Megginson]

commit a61c388ea3d259e683dd8ff43be2fe501958bbc1
Merge: fa954e1 028e0e9
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Aug 26 15:47:36 2010 -0600

    Merge branch 'master' into el5
    
    Conflicts:
    
    	389-admin.spec

 .gitignore             |    2 +-
 389-admin-git-local.sh |    2 +-
 389-admin-git.sh       |    2 +-
 389-admin.spec         |    9 ++++++---
 sources                |    2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)
---
diff --cc 389-admin.spec
index 93c3640,e997154..29de09f
--- a/389-admin.spec
+++ b/389-admin.spec
@@@ -1,10 -1,10 +1,10 @@@
  %global pkgname   dirsrv
  # for a pre-release, define the prerel field - comment out for official release
- %global prerel .rc2
+ # % global prerel .rc2
  # also need the relprefix 0. field for a pre-release - also comment out for official release
- %global relprefix 0.
+ # % global relprefix 0.
  
 -%global selinux_variants mls targeted
 +%global selinux_variants strict targeted
  
  Summary:          389 Administration Server (admin)
  Name:             389-admin
@@@ -219,7 -217,10 +219,10 @@@ en
  %{_mandir}/man8/*
  
  %changelog
+ * Thu Aug 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-1
+ - This is the final 1.1.11 release
+ 
 -* Wed Aug  4 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-0.7.rc2
 +* Wed Aug  4 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-0.6.rc2
  - 1.1.11.rc2 release
  - git tag 389-admin-1.1.11.rc2
  - Bug 594745 - Get rid of dirsrv_lib_t label