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

[Richard Allen Megginson]

commit 95ab1da8cf43710d3a4dc6127d804e522001f514
Merge: a61c388 9a50eb2
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Oct 26 13:30:59 2010 -0600

    Merge branch 'f13' into el5

 .gitignore             |    2 +-
 389-admin-git-local.sh |    6 ++++--
 389-admin-git.sh       |    2 +-
 389-admin.spec         |   14 ++++++++++----
 sources                |    2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)
---
diff --cc 389-admin.spec
index 29de09f,0d8197a..9e9e880
--- 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 .a2
  # 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