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

[Richard Allen Megginson]

commit 208e793d8354fa9efcd7fde552e9f5b127c58742
Merge: 85a24cb 5fd2662
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Aug 26 15:26:24 2010 -0600

    Merge branch 'master' into el5

 389-ds-base.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --cc 389-ds-base.spec
index c248ee7,f193a3f..8c06e87
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -1,11 -1,13 +1,13 @@@
  
  %global pkgname   dirsrv
  # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
- #%global prerel .rc7
+ # also remove the space between % and global - this space is needed because
+ # fedpkg verrel stupidly ignores comment lines
+ #% 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