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

[Richard Allen Megginson]

commit 4ac571cf69d7b1185a802f1424c7fa3918391d56
Merge: 59d0b31 028e0e9
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Aug 26 15:47:58 2010 -0600

    Merge branch 'master' into el4

 .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 c6032e9,e997154..93ad48d
--- a/389-admin.spec
+++ b/389-admin.spec
@@@ -1,9 -1,11 +1,9 @@@
  %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
 -
  Summary:          389 Administration Server (admin)
  Name:             389-admin
  Version:          1.1.11
@@@ -192,8 -216,10 +192,11 @@@ en
  %{_libdir}/%{pkgname}
  %{_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
  - 1.1.11.rc2 release
  - git tag 389-admin-1.1.11.rc2