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

[Richard Allen Megginson]

commit f02ad6fc3e91495189aea2ab3b86d8214c50ec65
Merge: 42e2fc9 b5f6fe3
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Aug 26 15:07:32 2010 -0600

    Merge branch 'master' into el4

 .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 9f1b30c,2c3b285..41a234b
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -1,10 -1,12 +1,10 @@@
  
  %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
 -
  Summary:          389 Directory Server (base)
  Name:             389-ds-base
  Version:          1.2.6
@@@ -251,7 -341,14 +251,10 @@@ f
  %{_includedir}/%{pkgname}
  %{_libdir}/%{pkgname}/*.so
  
 -%files selinux-devel
 -%defattr(-,root,root,-)
 -%{_datadir}/%{pkgname}-selinux
 -
  %changelog
+ * Thu Aug 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-1
+ - This is the final 1.2.6 release
+ 
  * Tue Aug 10 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-0.11.rc7
  - 1.2.6 release candidate 7
  - git tag 389-ds-base-1.2.6.rc7