[389-ds-base/f14/master: 15/15] Merge branch 'f13' into f14

[Richard Allen Megginson]

commit 55828d826afb4c69b26dde915d21b7d7ed53a74e
Merge: 980c46c 541ff87
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Aug 4 11:03:01 2010 -0600

    Merge branch 'f13' into f14
    
    Conflicts:
    
    	.gitignore
    	389-ds-base-git-local.sh
    	389-ds-base-git.sh
    	389-ds-base.spec
    	sources

 .gitignore               |    3 ++-
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |   18 ++++++++++++++++--
 sources                  |    2 +-
 5 files changed, 21 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 30216f5,edba661..5d85e94
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
--389-ds-base-1.2.6.rc3.tar.bz2
 -*~
+ 389-ds-base-1.2.6.rc6.tar.bz2
++*~
diff --cc 389-ds-base.spec
index b11b0d2,16ca8dc..a9972cb
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -10,7 -10,7 +10,7 @@@
  Summary:          389 Directory Server (base)
  Name:             389-ds-base
  Version:          1.2.6
--Release:          %{?relprefix}9%{?prerel}%{?dist}
++Release:          %{?relprefix}10%{?prerel}%{?dist}
  License:          GPLv2 with exceptions
  URL:              http://port389.org/
  Group:            System Environment/Daemons
@@@ -346,10 -345,20 +346,24 @@@ en
  %{_datadir}/%{pkgname}-selinux
  
  %changelog
 -* Mon Aug  2 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-0.9.rc6
++* Mon Aug  2 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-0.10.rc6
+ - 1.2.6 release candidate 6
+ - git tag 389-ds-base-1.2.6.rc6
+ - Bug 617013 - repl-monitor.pl use cpu upto 90%
+ - Bug 616618 - 389 v1.2.5 accepts 2 identical entries with different DN formats
+ - Bug 547503 - replication broken again, with 389 MMR replication and TCP errors
+ - Bug 613833 - Allow dirsrv_t to bind to rpc ports
+ - Bug 612242 - membership change on DS does not show on AD
+ - Bug 617629 - Missing aliases in new schema files
+ - Bug 619595 - Upgrading sub suffix under non-normalized suffix disappears
+ - Bug 616608 - SIGBUS in RDN index reads on platforms with strict alignments
+ - Bug 617862 - Replication: Unable to delete tombstone errors
+ - Bug 594745 - Get rid of dirsrv_lib_t label
+ 
 +* Wed Jul 14 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-0.9.rc3
 +- make selinux-devel explicit Require the base package in order
 +- to comply with Fedora Licensing Guidelines
 +
  * Thu Jul  1 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-0.8.rc3
  - 1.2.6 release candidate 3
  - git tag 389-ds-base-1.2.6.rc3