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

[Richard Allen Megginson]

commit 84b5e914705577e63857c30a6816b71d6dceb14d
Merge: f02ad6f 5fd2662
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Aug 26 15:26:30 2010 -0600

    Merge branch 'master' into el4

 389-ds-base.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --cc 389-ds-base.spec
index 41a234b,f193a3f..67074e4
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -1,10 -1,14 +1,12 @@@
  
  %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
 -
  Summary:          389 Directory Server (base)
  Name:             389-ds-base
  Version:          1.2.6