[389-ds-base] Merge branch 'f13'

[Richard Allen Megginson]

commit 02e869fdbfee2a7a450c5356cfe6ea31ba81ab5a
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Aug 4 10:56:56 2010 -0600

    Merge branch 'f13'
    
    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 --git a/.gitignore b/.gitignore
index 30216f5..5d85e94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-389-ds-base-1.2.6.rc3.tar.bz2
+389-ds-base-1.2.6.rc6.tar.bz2
+*~
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 999539c..39562f4 100644
--- a/389-ds-base-git-local.sh
+++ b/389-ds-base-git-local.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.6.rc3
+VERSION=1.2.6.rc6
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh
index 4514966..2825260 100644
--- a/389-ds-base-git.sh
+++ b/389-ds-base-git.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.6.rc3
+VERSION=1.2.6.rc6
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
diff --git a/389-ds-base.spec b/389-ds-base.spec
index b11b0d2..a9972cb 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -1,7 +1,7 @@
 
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
-%global prerel .rc3
+%global prerel .rc6
 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
 %global relprefix 0.
 
@@ -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,6 +346,20 @@ end
 %{_datadir}/%{pkgname}-selinux
 
 %changelog
+* 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
diff --git a/sources b/sources
index ae9ee47..011cf7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18511d2ec2b2b7704ae12e552077d1f6  389-ds-base-1.2.6.rc3.tar.bz2
+143c4653cf8f3fd3e4cf12617deb8a0f  389-ds-base-1.2.6.rc6.tar.bz2