From 42e2fc97f6e166393ec4d33753ee8174e4ccd34a Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Aug 10 2010 14:30:33 +0000
Subject: Merge branch 'el5' into el4


Conflicts:

	389-ds-base.spec

---

diff --git a/.gitignore b/.gitignore
index 5d85e94..d894c58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-389-ds-base-1.2.6.rc6.tar.bz2
 *~
+389-ds-base-1.2.6.rc7.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 39562f4..a54c749 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.rc6
+VERSION=1.2.6.rc7
 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 2825260..ee57fdd 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.rc6
+VERSION=1.2.6.rc7
 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 9eb986a..9f1b30c 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -1,14 +1,14 @@
 
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
-%global prerel .rc6
+%global prerel .rc7
 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.6
-Release:          %{?relprefix}9%{?prerel}%{?dist}
+Release:          %{?relprefix}11%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -97,6 +97,7 @@ Development Libraries and headers for the 389 Directory Server base package.
 %package          selinux-devel
 Summary:          Development interface for 389 Directory Server base SELinux policy
 Group:            Development/Libraries
+Requires:         %{name} = %{version}-%{release}
 
 %description      selinux-devel
 SELinux policy interface for the 389 Directory Server base package.
@@ -251,7 +252,12 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
-* Mon Aug  2 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.9.rc6
+* Tue Aug 10 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.11.rc7
+- 1.2.6 release candidate 7
+- git tag 389-ds-base-1.2.6.rc7
+- Bug 621928 - Unable to enable replica (rdn problem?) on 1.2.6 rc6
+
+* Mon Aug  2 2010 Rich Megginson <rmeggins@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%
@@ -265,6 +271,10 @@ fi
 - Bug 617862 - Replication: Unable to delete tombstone errors
 - Bug 594745 - Get rid of dirsrv_lib_t label
 
+* Wed Jul 14 2010 Rich Megginson <rmeggins@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@redhat.com> - 1.2.6-0.8.rc3
 - 1.2.6 release candidate 3
 - git tag 389-ds-base-1.2.6.rc3
@@ -285,6 +295,9 @@ fi
 * Wed Jun  9 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.5.rc1
 - 1.2.6 release candidate 1
 
+* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.2.6-0.4.a4.1
+- Mass rebuild with perl-5.12.0
+
 * Wed May 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.4.a4
 - 1.2.6.a4 release
 - replace lua code with shell scripts where possible, otherwise, just removed it
@@ -295,6 +308,9 @@ fi
 - removed selinux policy since EL4 doesn't support modules
 - many bug fixes
 
+* Fri Apr  2 2010 Caolán McNamara <caolanm@redhat.com> - 1.2.6-0.3.a2
+- rebuild for icu 4.4
+
 * Mon Mar  2 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.2.a2
 - 1.2.6.a2 release
 - add support for matching rules
diff --git a/sources b/sources
index 011cf7c..50ef2ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-143c4653cf8f3fd3e4cf12617deb8a0f  389-ds-base-1.2.6.rc6.tar.bz2
+63598946045858e41d688b132dd279d5  389-ds-base-1.2.6.rc7.tar.bz2