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

[Richard Allen Megginson]

commit c3c16d36ef6b09825692a4c5aa11a9398de8d210
Merge: b46759a b5f6fe3
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Aug 26 15:04:39 2010 -0600

    Merge branch 'master' into f13

 .gitignore               |    2 +-
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |    9 ++++++---
 sources                  |    2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)
---
diff --cc 389-ds-base.spec
index f83e979,2c3b285..c248ee7
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -1,11 -1,11 +1,11 @@@
  
  %global pkgname   dirsrv
  # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
- %global prerel .rc7
+ #%global prerel .rc7
  # 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 selinux_variants strict targeted
  
  Summary:          389 Directory Server (base)
  Name:             389-ds-base